Merge staging and PR #35021

It's the last staging commit (mostly) built on Hydra, and a minimal fix for Darwin regression in pysqlite.
2018-02-16 09:13:12 +01:00
parent 90252481bf 2b851d14d9
commit b5aaaf87a7
181 changed files with 3126 additions and 592 deletions
@@ -51,6 +51,7 @@ let
  # shell glob that ought to match it.
  dynamicLinker =
    /**/ if libc == null then null
+    else if targetPlatform.libc == "musl"             then "${libc_lib}/lib/ld-musl-*"
    else if targetPlatform.system == "i686-linux"     then "${libc_lib}/lib/ld-linux.so.2"
    else if targetPlatform.system == "x86_64-linux"   then "${libc_lib}/lib/ld-linux-x86-64.so.2"
    # ARM with a wildcard, which can be "" or "-armhf".