Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1c44d5efc6bc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c634647271a8
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Nov 27, 2017

  1. binutils-wrapper: Remove stray file left over from old revert 

    binutils-wrapper was removed in ec8d41f. I
hope to reintroduce it, but under a different name, so this can go.
    @Ericson2314
    Ericson2314 committed Nov 27, 2017
    Copy the full SHA
    caa3599 View commit details

  2. cc-wrapper: Fix stray binPrefix -> targetPrefix 

    I thought my sed in e755a8a was
exhaustive, but it was not.
    @Ericson2314
    Ericson2314 committed Nov 27, 2017
    Copy the full SHA
    43e00f7 View commit details

  3. Merge branch 'ericson2314-cross-base' into staging 

    I forgot to sed some files in #32098.
    @Ericson2314
    Ericson2314 committed Nov 27, 2017
    Copy the full SHA
    c634647 View commit details
108 changes: 0 additions & 108 deletions pkgs/build-support/binutils-wrapper/macos-sierra-reexport-hack.bash
View file

This file was deleted.

6 changes: 3 additions & 3 deletions pkgs/build-support/cc-wrapper/macos-sierra-reexport-hack.bash
View file
Original file line number Diff line number Diff line change
@@ -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" \
4 changes: 2 additions & 2 deletions pkgs/build-support/cc-wrapper/setup-hook.sh
View file
Original file line number Diff line number Diff line change
@@ -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