diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-11-27 03:27:22 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-11-27 03:30:15 -0500 |
| commit | 43e00f7d186ff96c8d6fa5498a3878253dcec920 (patch) | |
| tree | 0905082a3d1170a49ec7651a635a502cd7276a81 /pkgs/build-support | |
| parent | caa3599599edce2e5113dbc9fdb9e94d4111461a (diff) | |
| download | nixlib-43e00f7d186ff96c8d6fa5498a3878253dcec920.tar nixlib-43e00f7d186ff96c8d6fa5498a3878253dcec920.tar.gz nixlib-43e00f7d186ff96c8d6fa5498a3878253dcec920.tar.bz2 nixlib-43e00f7d186ff96c8d6fa5498a3878253dcec920.tar.lz nixlib-43e00f7d186ff96c8d6fa5498a3878253dcec920.tar.xz nixlib-43e00f7d186ff96c8d6fa5498a3878253dcec920.tar.zst nixlib-43e00f7d186ff96c8d6fa5498a3878253dcec920.zip | |
cc-wrapper: Fix stray binPrefix -> targetPrefix
I thought my sed in e755a8a27d5c33d87a5742817c373028d35443e9 was exhaustive, but it was not.
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash | 6 | ||||
| -rw-r--r-- | pkgs/build-support/cc-wrapper/setup-hook.sh | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash b/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash index b7aa7ea5c092..205035453332 100644 --- a/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash +++ b/pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash @@ -82,18 +82,18 @@ else symbolBloatObject=$outputNameLibless-symbol-hack.o if [[ ! -e $symbolBloatObject ]]; then printf '.private_extern _______child_hack_foo\nchild_hack_foo:\n' \ - | @binPrefix@as -- -o $symbolBloatObject + | @targetPrefix@as -- -o $symbolBloatObject fi # first half of libs - @binPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ + @targetPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ -o "$out/lib/lib${children[0]}.dylib" \ -install_name "$out/lib/lib${children[0]}.dylib" \ "${childrenLookup[@]}" "$symbolBloatObject" \ "${childrenLink[@]:0:$((${#childrenLink[@]} / 2 ))}" # second half of libs - @binPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ + @targetPrefix@ld -macosx_version_min $MACOSX_DEPLOYMENT_TARGET -arch x86_64 -dylib \ -o "$out/lib/lib${children[1]}.dylib" \ -install_name "$out/lib/lib${children[1]}.dylib" \ "${childrenLookup[@]}" "$symbolBloatObject" \ diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh index e43c1609edb1..a8f29bd5877d 100644 --- a/pkgs/build-support/cc-wrapper/setup-hook.sh +++ b/pkgs/build-support/cc-wrapper/setup-hook.sh @@ -142,9 +142,9 @@ for CMD in \ ar as nm objcopy ranlib strip strings size ld windres do if - PATH=$_PATH type -p "@binPrefix@$CMD" > /dev/null + PATH=$_PATH type -p "@targetPrefix@$CMD" > /dev/null then - export "${role}$(echo "$CMD" | tr "[:lower:]" "[:upper:]")=@binPrefix@${CMD}"; + export "${role}$(echo "$CMD" | tr "[:lower:]" "[:upper:]")=@targetPrefix@${CMD}"; fi done |