diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-04-18 15:40:49 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-04-18 15:40:49 -0400 |
| commit | 1ea80c2cc378da8072f821267793561e22467c3b (patch) | |
| tree | ea7d4024bb001330390b9b381402d5a1af156df4 /pkgs/build-support | |
| parent | e3d50e5cb0ad9de55f0ea3a01fd837667b038a48 (diff) | |
| parent | 45b21b38a8ca61fed1b2ea7db3cd1bbe8ff3d848 (diff) | |
Merge remote-tracking branch 'upstream/master' into staging
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 96d48ecbc79d6..f6248335052cb 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -48,7 +48,7 @@ let coreutils_bin = if nativeTools then "" else getBin coreutils; default_cxx_stdlib_compile = if (targetPlatform.isLinux && !(cc.isGNU or false) && !nativeTools && cc ? gcc) && !(targetPlatform.useLLVM or false) then - "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)" + "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/${targetPlatform.config}" else if targetPlatform.isDarwin && (libcxx != null) && (cc.isClang or false) && !(targetPlatform.useLLVM or false) then "-isystem ${libcxx}/include/c++/v1" else ""; |