diff options
author | John Ericson <Ericson2314@yahoo.com> | 2018-05-07 15:32:10 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-07 15:32:10 -0400 |
commit | 4f7cdd35d58e3d32ba576e218316b3c835bc508c (patch) | |
tree | b88a4fc1cb1f397c83dbf32d598c07c6361fb2cf /pkgs/build-support/bintools-wrapper/setup-hook.sh | |
parent | 1c87d77efea75e29061d13e11af68efa6f50aee2 (diff) | |
parent | 8b0fce8cb1013837cd2108193653a1763cd68266 (diff) | |
download | nixlib-4f7cdd35d58e3d32ba576e218316b3c835bc508c.tar nixlib-4f7cdd35d58e3d32ba576e218316b3c835bc508c.tar.gz nixlib-4f7cdd35d58e3d32ba576e218316b3c835bc508c.tar.bz2 nixlib-4f7cdd35d58e3d32ba576e218316b3c835bc508c.tar.lz nixlib-4f7cdd35d58e3d32ba576e218316b3c835bc508c.tar.xz nixlib-4f7cdd35d58e3d32ba576e218316b3c835bc508c.tar.zst nixlib-4f7cdd35d58e3d32ba576e218316b3c835bc508c.zip |
Merge pull request #40139 from obsidiansystems/modular-setup-hooks
treewide: Modular setup hooks
Diffstat (limited to 'pkgs/build-support/bintools-wrapper/setup-hook.sh')
-rw-r--r-- | pkgs/build-support/bintools-wrapper/setup-hook.sh | 38 |
1 files changed, 8 insertions, 30 deletions
diff --git a/pkgs/build-support/bintools-wrapper/setup-hook.sh b/pkgs/build-support/bintools-wrapper/setup-hook.sh index 831ee9b03872..28387bac5033 100644 --- a/pkgs/build-support/bintools-wrapper/setup-hook.sh +++ b/pkgs/build-support/bintools-wrapper/setup-hook.sh @@ -11,44 +11,22 @@ set -u [[ -z ${crossConfig-} ]] || (( "$hostOffset" < 0 )) || return 0 bintoolsWrapper_addLDVars () { - case $depHostOffset in - -1) local role='BUILD_' ;; - 0) local role='' ;; - 1) local role='TARGET_' ;; - *) echo "bintools-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2; - return 1 ;; - esac + # See ../setup-hooks/role.bash + local role_post role_pre + getTargetRoleEnvHook if [[ -d "$1/lib64" && ! -L "$1/lib64" ]]; then - export NIX_${role}LDFLAGS+=" -L$1/lib64" + export NIX_${role_pre}LDFLAGS+=" -L$1/lib64" fi if [[ -d "$1/lib" ]]; then - export NIX_${role}LDFLAGS+=" -L$1/lib" + export NIX_${role_pre}LDFLAGS+=" -L$1/lib" fi } -case $targetOffset in - -1) - export NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_BUILD=1 - role_pre='BUILD_' - role_post='_FOR_BUILD' - ;; - 0) - export NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_HOST=1 - role_pre='' - role_post='' - ;; - 1) - export NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_TARGET=1 - role_pre='TARGET_' - role_post='_FOR_TARGET' - ;; - *) - echo "cc-wrapper: used as improper sort of dependency" >2; - return 1 - ;; -esac +# See ../setup-hooks/role.bash +getTargetRole +getTargetRoleWrapper addEnvHooks "$targetOffset" bintoolsWrapper_addLDVars |