From 810fb0c9682053dcaa3eadfff4f52128f9cb5c4f Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 7 Aug 2017 11:04:19 -0400 Subject: cc-wrapper: Don't slurp `NIX_DONT_SET_RPATH` twice Otherwise we end with a definition like `1 1`, which doesn't trigger the right conditional. --- pkgs/build-support/cc-wrapper/add-flags.sh | 1 - 1 file changed, 1 deletion(-) (limited to 'pkgs/build-support') diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index b3a765d38e38..3d01dba64766 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -58,7 +58,6 @@ for pre in "${role_prefixes[@]}"; do slurpUnsalted CFLAGS_LINK slurpUnsalted CXXSTDLIB_COMPILE slurpUnsalted CXXSTDLIB_LINK - slurpUnsalted DONT_SET_RPATH slurpUnsalted GNATFLAGS_COMPILE slurpUnsalted IGNORE_LD_THROUGH_GCC slurpUnsalted LDFLAGS -- cgit 1.4.1