diff options
| author | Ben Wolsieffer <benwolsieffer@gmail.com> | 2018-06-01 19:42:05 -0400 |
|---|---|---|
| committer | Ben Wolsieffer <benwolsieffer@gmail.com> | 2018-06-03 10:54:32 -0400 |
| commit | 645f03b9494aedf332181bcba1b7bf4f11e2b89a (patch) | |
| tree | 471c0dcc1316a593dd4b207ea74d02c343ba064b /pkgs/build-support | |
| parent | 507d24a7def2bc16ee3034371c9851ef8ec8843a (diff) | |
| download | nixlib-645f03b9494aedf332181bcba1b7bf4f11e2b89a.tar nixlib-645f03b9494aedf332181bcba1b7bf4f11e2b89a.tar.gz nixlib-645f03b9494aedf332181bcba1b7bf4f11e2b89a.tar.bz2 nixlib-645f03b9494aedf332181bcba1b7bf4f11e2b89a.tar.lz nixlib-645f03b9494aedf332181bcba1b7bf4f11e2b89a.tar.xz nixlib-645f03b9494aedf332181bcba1b7bf4f11e2b89a.tar.zst nixlib-645f03b9494aedf332181bcba1b7bf4f11e2b89a.zip | |
cc-wrapper, bintools-wrapper: use getHostRoleEnvHook instead of getTargetRoleEnvHook
Fixes include and link paths when cross compiling.
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/bintools-wrapper/setup-hook.sh | 2 | ||||
| -rw-r--r-- | pkgs/build-support/cc-wrapper/setup-hook.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/bintools-wrapper/setup-hook.sh b/pkgs/build-support/bintools-wrapper/setup-hook.sh index 34e853226501..025f6aa6e7aa 100644 --- a/pkgs/build-support/bintools-wrapper/setup-hook.sh +++ b/pkgs/build-support/bintools-wrapper/setup-hook.sh @@ -13,7 +13,7 @@ set -u bintoolsWrapper_addLDVars () { # See ../setup-hooks/role.bash local role_post role_pre - getTargetRoleEnvHook + getHostRoleEnvHook if [[ -d "$1/lib64" && ! -L "$1/lib64" ]]; then export NIX_${role_pre}LDFLAGS+=" -L$1/lib64" diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh index 9dacacc1f369..28060de74118 100644 --- a/pkgs/build-support/cc-wrapper/setup-hook.sh +++ b/pkgs/build-support/cc-wrapper/setup-hook.sh @@ -68,7 +68,7 @@ set -u ccWrapper_addCVars () { # See ../setup-hooks/role.bash local role_post role_pre - getTargetRoleEnvHook + getHostRoleEnvHook if [[ -d "$1/include" ]]; then export NIX_${role_pre}CFLAGS_COMPILE+=" ${ccIncludeFlag:--isystem} $1/include" |