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

cc-wrapper: Make sure symbol tables of child delegators is not empty

Browse Source 
As described in https://github.com/NixOS/nixpkgs/issues/18461, MacOS no
longer accepts dylibs which only reexport other dylibs, because their
symbol tables are empty. To get around this, we define an object file
with a single "private extern" symbol, which hopefully won't clobber
anything.
This commit is contained in:
John Ericson 2017-07-26 20:26:57 -04:00 committed by John Ericson
parent 9242c8b331
commit 1cd74ac70a
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/build-support/cc-wrapper/default.nix
View File

@ -299,10 +299,11 @@ stdenv.mkDerivation {
'' + (if !useMacosReexportHack then '' '' + (if !useMacosReexportHack then ''
wrap ${prefix}ld ${./ld-wrapper.sh} ''${ld:-$ldPath/${prefix}ld} wrap ${prefix}ld ${./ld-wrapper.sh} ''${ld:-$ldPath/${prefix}ld}
'' else '' '' else ''
export ldWrapper="$out/bin/${prefix}ld" innerLd="${prefix}ld-reexport-delegate" export binPrefix=${prefix}
wrap "$innerLd" ${./macos-sierra-reexport-hack.bash} ''${ld:-$ldPath/${prefix}ld} ldInner="${prefix}ld-reexport-delegate"
wrap "${prefix}ld" ${./ld-wrapper.sh} "$out/bin/$innerLd" wrap "$ldInner" ${./macos-sierra-reexport-hack.bash} ''${ld:-$ldPath/${prefix}ld}
unset ldWrapper wrap "${prefix}ld" ${./ld-wrapper.sh} "$out/bin/$ldInner"
unset ldInner
'') + '' '') + ''
if [ -e ${binutils_bin}/bin/${prefix}ld.gold ]; then if [ -e ${binutils_bin}/bin/${prefix}ld.gold ]; then

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

@ -74,18 +74,26 @@ else
mkdir -p "$out/lib" mkdir -p "$out/lib"
PATH="$PATH:@out@/bin"
symbolBloatObject=$outputNameLibless-symbol-hack.o
if [[ ! -e $symbolBloatObject ]]; then
printf '.private_extern _______child_hack_foo\nchild_hack_foo:\n' \
| @binPrefix@as -- -o $symbolBloatObject
fi
# first half of libs # first half of libs
@ldWrapper@ -macosx_version_min 10.10 -arch x86_64 -dylib \ @binPrefix@ld -macosx_version_min 10.10 -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[@]}" \ "${childrenLookup[@]}" "$symbolBloatObject" \
"${childrenLink[@]:0:$((${#childrenLink[@]} / 2 ))}" "${childrenLink[@]:0:$((${#childrenLink[@]} / 2 ))}"
# second half of libs # second half of libs
@ldWrapper@ -macosx_version_min 10.10 -arch x86_64 -dylib \ @binPrefix@ld -macosx_version_min 10.10 -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[@]}" \ "${childrenLookup[@]}" "$symbolBloatObject" \
"${childrenLink[@]:$((${#childrenLink[@]} / 2 ))}" "${childrenLink[@]:$((${#childrenLink[@]} / 2 ))}"
allArgs+=("-L$out/lib" "-l${children[0]}" "-l${children[1]}") allArgs+=("-L$out/lib" "-l${children[0]}" "-l${children[1]}")