about summary refs log tree commit diff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorDavid McFarland <corngood@gmail.com>2016-11-19 10:06:39 -0400
committerDavid McFarland <corngood@gmail.com>2016-11-19 20:21:32 -0400
commit175461e09b4631d87716308431b5f83fb2db396e (patch)
treead2372ea2c7e7938adc04e64829454538ffc078b /pkgs/build-support
parent3995655d2c2cc7d9804172cd393cf673a21c5832 (diff)
downloadnixlib-175461e09b4631d87716308431b5f83fb2db396e.tar
nixlib-175461e09b4631d87716308431b5f83fb2db396e.tar.gz
nixlib-175461e09b4631d87716308431b5f83fb2db396e.tar.bz2
nixlib-175461e09b4631d87716308431b5f83fb2db396e.tar.lz
nixlib-175461e09b4631d87716308431b5f83fb2db396e.tar.xz
nixlib-175461e09b4631d87716308431b5f83fb2db396e.tar.zst
nixlib-175461e09b4631d87716308431b5f83fb2db396e.zip
cc-wrapper: don't expand $ in response files
This makes the response file handling more consistent with GCC.

For example, a reponse file may contain:

    "-Wl,$ORIGIN"

GCC will treat this as a double quoted string and not expand the
variable reference.  Previously, cc-wrapper would expand the variable
in the same was as if the string was provided on the command line.
Diffstat (limited to 'pkgs/build-support')
-rw-r--r--pkgs/build-support/cc-wrapper/utils.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/cc-wrapper/utils.sh b/pkgs/build-support/cc-wrapper/utils.sh
index 481d642f9674..aba5f3295a98 100644
--- a/pkgs/build-support/cc-wrapper/utils.sh
+++ b/pkgs/build-support/cc-wrapper/utils.sh
@@ -34,7 +34,7 @@ expandResponseParams() {
             @*)
                 if [ -e "${p:1}" ]; then
                     args=$(<"${p:1}")
-                    eval 'for arg in '$args'; do params+=("$arg"); done'
+                    eval 'for arg in '${args//$/\\$}'; do params+=("$arg"); done'
                 else
                     params+=("$p")
                 fi