forked from mirrors/nixpkgs
Merge pull request #37707 from obsidiansystems/gettext-setup-hook-cross
gettext, libiconv: Make setup hook work for cross
This commit is contained in:
commit
5d116251db
|
@ -9,7 +9,18 @@ addEnvHooks "$hostOffset" gettextDataDirsHook
|
||||||
# libintl must be listed in load flags on non-Glibc
|
# libintl must be listed in load flags on non-Glibc
|
||||||
# it doesn't hurt to have it in Glibc either though
|
# it doesn't hurt to have it in Glibc either though
|
||||||
gettextLdflags() {
|
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
|
if [ ! -z "@gettextNeedsLdflags@" ]; then
|
||||||
|
|
|
@ -1,7 +1,18 @@
|
||||||
# libiconv must be listed in load flags on non-Glibc
|
# libiconv must be listed in load flags on non-Glibc
|
||||||
# it doesn't hurt to have it in Glibc either though
|
# it doesn't hurt to have it in Glibc either though
|
||||||
iconvLdflags() {
|
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
|
addEnvHooks "$hostOffset" iconvLdflags
|
||||||
|
|
Loading…
Reference in a new issue