From 645f03b9494aedf332181bcba1b7bf4f11e2b89a Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 1 Jun 2018 19:42:05 -0400 Subject: [PATCH] cc-wrapper, bintools-wrapper: use getHostRoleEnvHook instead of getTargetRoleEnvHook Fixes include and link paths when cross compiling. --- pkgs/build-support/bintools-wrapper/setup-hook.sh | 2 +- 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"