Merge pull request #37707 from obsidiansystems/gettext-setup-hook-cross

gettext, libiconv: Make setup hook work for cross
This commit is contained in:
John Ericson 2018-03-23 15:21:43 -04:00 committed by GitHub
commit 5d116251db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 2 deletions

View File

@ -9,7 +9,18 @@ addEnvHooks "$hostOffset" gettextDataDirsHook
# libintl must be listed in load flags on non-Glibc
# it doesn't hurt to have it in Glibc either though
gettextLdflags() {
export NIX_LDFLAGS="$NIX_LDFLAGS -lintl"
# The `depHostOffset` describes how the host platform of the dependencies
# are slid relative to the depending package. It is brought into scope of
# the environment hook defined as the role of the dependency being applied.
case $depHostOffset in
-1) local role='BUILD_' ;;
0) local role='' ;;
1) local role='TARGET_' ;;
*) echo "cc-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2;
return 1 ;;
esac
export NIX_${role}LDFLAGS+=" -lintl"
}
if [ ! -z "@gettextNeedsLdflags@" ]; then

View File

@ -1,7 +1,18 @@
# libiconv must be listed in load flags on non-Glibc
# it doesn't hurt to have it in Glibc either though
iconvLdflags() {
export NIX_LDFLAGS="$NIX_LDFLAGS -liconv"
# The `depHostOffset` describes how the host platform of the dependencies
# are slid relative to the depending package. It is brought into scope of
# the environment hook defined as the role of the dependency being applied.
case $depHostOffset in
-1) local role='BUILD_' ;;
0) local role='' ;;
1) local role='TARGET_' ;;
*) echo "cc-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2;
return 1 ;;
esac
export NIX_${role}LDFLAGS+=" -liconv"
}
addEnvHooks "$hostOffset" iconvLdflags