about summary refs log tree commit diff
path: root/nixpkgs/pkgs/build-support/cc-wrapper/add-flags.sh
diff options
context:
space:
mode:
authorJohn Ericson <git@JohnEricson.me>2020-04-13 20:44:43 -0400
committerAlyssa Ross <hi@alyssa.is>2020-11-27 13:27:16 +0000
commit41c637e4b3b17f19b6ce705bdb755e8f98eabb0b (patch)
treebe6af446196d0a10e3770aba8e1b7a13191e774d /nixpkgs/pkgs/build-support/cc-wrapper/add-flags.sh
parent1949213e7997ac860af25d47f846e8b3cb6ecc09 (diff)
downloadnixlib-41c637e4b3b17f19b6ce705bdb755e8f98eabb0b.tar
nixlib-41c637e4b3b17f19b6ce705bdb755e8f98eabb0b.tar.gz
nixlib-41c637e4b3b17f19b6ce705bdb755e8f98eabb0b.tar.bz2
nixlib-41c637e4b3b17f19b6ce705bdb755e8f98eabb0b.tar.lz
nixlib-41c637e4b3b17f19b6ce705bdb755e8f98eabb0b.tar.xz
nixlib-41c637e4b3b17f19b6ce705bdb755e8f98eabb0b.tar.zst
nixlib-41c637e4b3b17f19b6ce705bdb755e8f98eabb0b.zip
C++ Compilers: Systematize handling of standard libraries
(cherry picked from commit f3f7612a409e4ebbec634ab7f20e094f206d396a)
Diffstat (limited to 'nixpkgs/pkgs/build-support/cc-wrapper/add-flags.sh')
-rw-r--r--nixpkgs/pkgs/build-support/cc-wrapper/add-flags.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/build-support/cc-wrapper/add-flags.sh b/nixpkgs/pkgs/build-support/cc-wrapper/add-flags.sh
index 3398f11e8c21..04be3f408ee1 100644
--- a/nixpkgs/pkgs/build-support/cc-wrapper/add-flags.sh
+++ b/nixpkgs/pkgs/build-support/cc-wrapper/add-flags.sh
@@ -37,6 +37,14 @@ if [ -e @out@/nix-support/libc-cflags ]; then
     NIX_CFLAGS_COMPILE_@suffixSalt@="$(< @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE_@suffixSalt@"
 fi
 
+if [ -e @out@/nix-support/libcxx-cxxflags ]; then
+    NIX_CXXSTDLIB_COMPILE_@suffixSalt@+=" $(< @out@/nix-support/libcxx-cxxflags)"
+fi
+
+if [ -e @out@/nix-support/libcxx-ldflags ]; then
+    NIX_CXXSTDLIB_LINK_@suffixSalt@+=" $(< @out@/nix-support/libcxx-ldflags)"
+fi
+
 if [ -e @out@/nix-support/cc-cflags ]; then
     NIX_CFLAGS_COMPILE_@suffixSalt@="$(< @out@/nix-support/cc-cflags) $NIX_CFLAGS_COMPILE_@suffixSalt@"
 fi