diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-12-17 04:24:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-17 04:24:19 +0000 |
| commit | eca6ab79f150e2b748765c8e715d73553661c2be (patch) | |
| tree | d696dbd10b7221d9478adb21dde3a0fc890d79ca /pkgs/build-support | |
| parent | 14ea28807da854446ca1b9433b20b2c48f715eba (diff) | |
| parent | 0c62b7cd7468820456da2ec9fd1cdc0347b90cd9 (diff) | |
Merge pull request #32498 from dylex/patch-1
Don't set cxx_stdlib when nativeTools on linux
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index b79697b33f0c1..2539f52accf08 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -46,7 +46,7 @@ let # The wrapper scripts use 'cat' and 'grep', so we may need coreutils. coreutils_bin = if nativeTools then "" else getBin coreutils; - default_cxx_stdlib_compile=optionalString (targetPlatform.isLinux && !(cc.isGNU or false)) + default_cxx_stdlib_compile = optionalString (targetPlatform.isLinux && !(cc.isGNU or false) && !nativeTools) "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)"; dashlessTarget = stdenv.lib.replaceStrings ["-"] ["_"] targetPlatform.config; |