ghc: don’t add libiconv automatically

ghc needs it to fail to correctly detect it for later.
This commit is contained in:
Matthew Bauer
2018-12-02 14:26:53 -06:00
parent a9d153633e
commit 7a00e80329
8 changed files with 37 additions and 3 deletions

View File

@@ -10,7 +10,7 @@ addEnvHooks "$hostOffset" gettextDataDirsHook
# libintl must be listed in load flags on non-Glibc
# it doesn't hurt to have it in Glibc either though
if [ ! -z "@gettextNeedsLdflags@" ]; then
if [ -n "@gettextNeedsLdflags@" -a -z "$dontAddExtraLibs" ]; then
# See pkgs/build-support/setup-hooks/role.bash
getHostRole
export NIX_${role_pre}LDFLAGS+=" -lintl"

View File

@@ -2,5 +2,7 @@
# it doesn't hurt to have it in Glibc either though
# See pkgs/build-support/setup-hooks/role.bash
getHostRole
export NIX_${role_pre}LDFLAGS+=" -liconv"
if [ -z "$dontAddExtraLibs" ]; then
getHostRole
export NIX_${role_pre}LDFLAGS+=" -liconv"
fi