diff options
| author | John Ericson <git@JohnEricson.me> | 2020-04-18 00:35:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-18 00:35:19 -0400 |
| commit | eb4acb6ca9c4482e7a65d4b1aaf4ec7c48ea6641 (patch) | |
| tree | 35eb7ce676678c5d9fcda8ef33f258f94c53639c /pkgs/build-support | |
| parent | 68a4ca45e07a0c6081264cf1c13d63f99c7fa15c (diff) | |
| parent | 204d7104053d5d97c0036e20a912814d63f71e6f (diff) | |
Merge pull request #85468 from Ericson2314/no-dumpmachine
treewide: Get rid of -dumpmachine in favor of static info
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 ""; |