pyrox.dev
Merge pull request #54624 from matthewbauer/libcxx
cc-wrapper: add libcxx for libcxxClang
authored by Matthew Bauer and committed by GitHub bb3683d7 92f0f8dd
+9
-5
pkgs/build-support/cc-wrapper/default.nix
+9
-5
pkgs/build-support/cc-wrapper/default.nix
···
13
13
, extraPackages ? [], extraBuildCommands ? ""
14
14
, isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null
15
15
, buildPackages ? {}
16
+
, libcxx ? null
16
17
}:
17
18
18
19
with stdenvNoCC.lib;
···
44
45
# The wrapper scripts use 'cat' and 'grep', so we may need coreutils.
45
46
coreutils_bin = if nativeTools then "" else getBin coreutils;
46
47
47
-
default_cxx_stdlib_compile = optionalString (targetPlatform.isLinux && !(cc.isGNU or false) && !nativeTools && cc ? gcc)
48
-
"-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)";
48
+
default_cxx_stdlib_compile = if (targetPlatform.isLinux && !(cc.isGNU or false) && !nativeTools && cc ? gcc) then
49
+
"-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)"
50
+
else if targetPlatform.isDarwin && (libcxx != null) && (cc.isClang or false) then
51
+
"-isystem ${libcxx}/include/c++/v1"
52
+
else "";
49
53
50
54
# The "infix salt" is a arbitrary string added in the middle of env vars
51
55
# defined by cc-wrapper's hooks so that multiple cc-wrappers can be used
···
256
260
257
261
echo "$ccLDFlags" > $out/nix-support/cc-ldflags
258
262
echo "$ccCFlags" > $out/nix-support/cc-cflags
259
-
''
260
-
261
-
+ optionalString propagateDoc ''
263
+
'' + optionalString (targetPlatform.isDarwin && (libcxx != null) && (cc.isClang or false)) ''
264
+
echo " -L${libcxx}/lib" >> $out/nix-support/cc-ldflags
265
+
'' + optionalString propagateDoc ''
262
266
##
263
267
## Man page and info support
264
268
##
+1
pkgs/development/compilers/llvm/5/default.nix
+1
pkgs/development/compilers/llvm/5/default.nix
+1
pkgs/development/compilers/llvm/6/default.nix
+1
pkgs/development/compilers/llvm/6/default.nix