diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-02 23:25:24 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-02 23:25:24 +0200 |
| commit | f21211ebfe21797c6f0444d42ec7cb835c737388 (patch) | |
| tree | 816465981f650242d4b22e0f01b912917e7008f8 /pkgs/stdenv | |
| parent | b291f2a9953d48d6edc5c73776db9ba289ccf213 (diff) | |
| parent | 12ae04518b004adf949a43125954b99c05189e6f (diff) | |
| download | nixpkgs-f21211ebfe21797c6f0444d42ec7cb835c737388.tar nixpkgs-f21211ebfe21797c6f0444d42ec7cb835c737388.tar.gz nixpkgs-f21211ebfe21797c6f0444d42ec7cb835c737388.tar.bz2 nixpkgs-f21211ebfe21797c6f0444d42ec7cb835c737388.tar.lz nixpkgs-f21211ebfe21797c6f0444d42ec7cb835c737388.tar.xz nixpkgs-f21211ebfe21797c6f0444d42ec7cb835c737388.tar.zst nixpkgs-f21211ebfe21797c6f0444d42ec7cb835c737388.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/cross/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 3bc4cd9a8fa..4e5c4cc2e83 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -55,6 +55,8 @@ in lib.init bootStages ++ [ then buildPackages.darwin.iosSdkPkgs.clang else if crossSystem.useAndroidPrebuilt or false 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; |