diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2018-06-04 22:42:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-04 22:42:27 -0400 |
| commit | c69c959cd95829da8df5e8c3f6a0e0c823e5e190 (patch) | |
| tree | a9212b493974c4f830f15b53e4243c920f3ab282 /pkgs/build-support | |
| parent | d1ebf508f508603fdc592f3ac12b1ad6b8d91849 (diff) | |
| parent | 645f03b9494aedf332181bcba1b7bf4f11e2b89a (diff) | |
Merge pull request #41429 from lopsided98/fix-env-hook
cc-wrapper, bintools-wrapper: unbreak include/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 34e8532265016..025f6aa6e7aa2 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 9dacacc1f369d..28060de741186 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" |