diff options
| author | John Ericson <git@JohnEricson.me> | 2019-09-02 01:31:31 -0400 |
|---|---|---|
| committer | John Ericson <git@JohnEricson.me> | 2019-09-02 01:31:31 -0400 |
| commit | c33d80c071927d783bd10943e723ed408ec89e48 (patch) | |
| tree | ee0d82edaae37f797995468b8dbd5ce4beffab27 /pkgs/stdenv/cross | |
| parent | 446f8c851d599326373a2c910841d092ff8e68ae (diff) | |
| parent | 74b42e28b94cc42f93b50c5aeee8794f66795fd0 (diff) | |
| download | nixpkgs-c33d80c071927d783bd10943e723ed408ec89e48.tar nixpkgs-c33d80c071927d783bd10943e723ed408ec89e48.tar.gz nixpkgs-c33d80c071927d783bd10943e723ed408ec89e48.tar.bz2 nixpkgs-c33d80c071927d783bd10943e723ed408ec89e48.tar.lz nixpkgs-c33d80c071927d783bd10943e723ed408ec89e48.tar.xz nixpkgs-c33d80c071927d783bd10943e723ed408ec89e48.tar.zst nixpkgs-c33d80c071927d783bd10943e723ed408ec89e48.zip | |
Merge remote-tracking branch 'upstream/master' into feature/js-unknown-ghcjs
Diffstat (limited to 'pkgs/stdenv/cross')
| -rw-r--r-- | pkgs/stdenv/cross/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 1c211f890b0..4e5c4cc2e83 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -37,7 +37,8 @@ in lib.init bootStages ++ [ # Run Packages (buildPackages: { inherit config; - overlays = overlays ++ crossOverlays; + overlays = overlays ++ crossOverlays + ++ (if crossSystem.isWasm then [(import ../../top-level/static.nix)] else []); selfBuild = false; stdenv = buildPackages.stdenv.override (old: rec { buildPlatform = localSystem; @@ -53,9 +54,11 @@ in lib.init bootStages ++ [ cc = if crossSystem.useiOSPrebuilt or false then buildPackages.darwin.iosSdkPkgs.clang else if crossSystem.useAndroidPrebuilt or false - then buildPackages."androidndkPkgs_${crossSystem.ndkVer}".gcc + then buildPackages."androidndkPkgs_${crossSystem.ndkVer}".clang else if targetPlatform.isGhcjs then null + else if crossSystem.useLLVM or false + then buildPackages.llvmPackages_8.lldClang else buildPackages.gcc; extraNativeBuildInputs = old.extraNativeBuildInputs @@ -63,7 +66,7 @@ in lib.init bootStages ++ [ (hostPlatform.isLinux && !buildPlatform.isLinux) [ buildPackages.patchelf ] ++ lib.optional - (let f = p: !p.isx86 || p.libc == "musl"; in f hostPlatform && !(f buildPlatform)) + (let f = p: !p.isx86 || p.libc == "musl" || p.libc == "wasilibc" || p.isiOS; in f hostPlatform && !(f buildPlatform)) buildPackages.updateAutotoolsGnuConfigScriptsHook # without proper `file` command, libtool sometimes fails # to recognize 64-bit DLLs |