public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cc-wrapper: Fix stray binPrefix -> targetPrefix

Browse Source 
I thought my sed in e755a8a27d5c33d87a5742817c373028d35443e9 was
exhaustive, but it was not.
This commit is contained in:
John Ericson 2017-11-27 03:27:22 -05:00
parent caa3599599
commit 43e00f7d18
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash
View File

@ -82,18 +82,18 @@ else
symbolBloatObject=$outputNameLibless-symbol-hack.o symbolBloatObject=$outputNameLibless-symbol-hack.o
if [[ ! -e $symbolBloatObject ]]; then if [[ ! -e $symbolBloatObject ]]; then
printf '.private_extern _______child_hack_foo\nchild_hack_foo:\n' \ printf '.private_extern _______child_hack_foo\nchild_hack_foo:\n' \
| @binPrefix@as -- -o $symbolBloatObject | @targetPrefix@as -- -o $symbolBloatObject
fi fi
# first half of libs # 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" \ -o "$out/lib/lib${children[0]}.dylib" \
-install_name "$out/lib/lib${children[0]}.dylib" \ -install_name "$out/lib/lib${children[0]}.dylib" \
"${childrenLookup[@]}" "$symbolBloatObject" \ "${childrenLookup[@]}" "$symbolBloatObject" \
"${childrenLink[@]:0:$((${#childrenLink[@]} / 2 ))}" "${childrenLink[@]:0:$((${#childrenLink[@]} / 2 ))}"
# second half of libs # 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" \ -o "$out/lib/lib${children[1]}.dylib" \
-install_name "$out/lib/lib${children[1]}.dylib" \ -install_name "$out/lib/lib${children[1]}.dylib" \
"${childrenLookup[@]}" "$symbolBloatObject" \ "${childrenLookup[@]}" "$symbolBloatObject" \

4
pkgs/build-support/cc-wrapper/setup-hook.sh
View File

@ -142,9 +142,9 @@ for CMD in \
ar as nm objcopy ranlib strip strings size ld windres ar as nm objcopy ranlib strip strings size ld windres
do do
if if
PATH=$_PATH type -p "@binPrefix@$CMD" > /dev/null PATH=$_PATH type -p "@targetPrefix@$CMD" > /dev/null
then then
export "${role}$(echo "$CMD" | tr "[:lower:]" "[:upper:]")=@binPrefix@${CMD}"; export "${role}$(echo "$CMD" | tr "[:lower:]" "[:upper:]")=@targetPrefix@${CMD}";
fi fi
done done