diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-12-18 15:56:03 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-12-18 15:56:03 +0000 |
| commit | 7c58e8dfc2bbe975147c7e1ee4b6066703b56528 (patch) | |
| tree | da3868d8a4bc0e2c7dce49d3be02661490d83131 /pkgs/build-support/cc-wrapper | |
| parent | c4b71137bfe30e2f8f454e8c28c09df492bf65e3 (diff) | |
| parent | 68d57167b058d86c41107da5c62190ffcf99dfe0 (diff) | |
| download | nixlib-7c58e8dfc2bbe975147c7e1ee4b6066703b56528.tar nixlib-7c58e8dfc2bbe975147c7e1ee4b6066703b56528.tar.gz nixlib-7c58e8dfc2bbe975147c7e1ee4b6066703b56528.tar.bz2 nixlib-7c58e8dfc2bbe975147c7e1ee4b6066703b56528.tar.lz nixlib-7c58e8dfc2bbe975147c7e1ee4b6066703b56528.tar.xz nixlib-7c58e8dfc2bbe975147c7e1ee4b6066703b56528.tar.zst nixlib-7c58e8dfc2bbe975147c7e1ee4b6066703b56528.zip | |
Merge branch 'master' into staging
* master: (125 commits) scummvm: fix eval tinycc: 0.9.27pre-20171016 -> 0.9.27 Update terraform provider versions vscode: 1.18.1 -> 1.19.0 linux: 4.14.6 -> 4.14.7 scummvm: 1.9.0 -> 2.0.0 cmst: 2017.03.18 -> 2017.09.19 albert: 0.14.7 -> 0.14.14 obs-studio: fix vlc plugin ffmpeg, ffmpeg-full: 3.4 -> 3.4.1 uchiwa: 0.26.3 -> 1.1.0 linux-testing: 4.15-rc3 -> 4.15-rc4 steam: override nss, nspr, fixes #32781 ponyc: 0.20.0 -> 0.21.0 pythonPackages.pwntools: disable tests gnome3.gnome-tweak-tool: 3.26.3 → 3.26.4 vim-rhubarb: init at 2017-06-28 atom: depend on libsecret nvidia-settings: Make sure binary can find libXv.so backblaze-b2: 0.6.2 -> 1.1.0 ...
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
| -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 5978d8665d09..218e9f6b957f 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -44,7 +44,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; |