cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #41429 from lopsided98/fix-env-hook

Browse source 
cc-wrapper, bintools-wrapper: unbreak include/link paths when cross-compiling
This commit is contained in:
John Ericson 2018-06-04 22:42:27 -04:00 committed by GitHub
commit c69c959cd9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/build-support/bintools-wrapper/setup-hook.sh
View file

@ -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"

2
pkgs/build-support/cc-wrapper/setup-hook.sh
View file

@ -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"