diff options
| author | Moritz Angermann <moritz.angermann@gmail.com> | 2021-04-27 10:57:05 +0800 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-05-25 05:52:02 -0400 |
| commit | 544414ba604b13e0992ad87e90b8bdf45c43011c (patch) | |
| tree | 3209dd75e5a99aff970f1729acd9f5749422b5a5 /libraries | |
| parent | c67c9e8239a767aa870c1b7aa2adf2a363205837 (diff) | |
| download | haskell-544414ba604b13e0992ad87e90b8bdf45c43011c.tar.gz | |
[ci/darwin] use system provided iconv and curses
Also make sure to be able to build with non-apple-clang, while using apple's SDK on macOS
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/base/configure.ac | 2 | ||||
| -rw-r--r-- | libraries/ghc-bignum/gmp/ghc.mk | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libraries/base/configure.ac b/libraries/base/configure.ac index 68295563af..f0b4f371c4 100644 --- a/libraries/base/configure.ac +++ b/libraries/base/configure.ac @@ -103,7 +103,7 @@ dnl-------------------------------------------------------------------- AC_ARG_WITH([iconv-includes], [AS_HELP_STRING([--with-iconv-includes], [directory containing iconv.h])], - [ICONV_INCLUDE_DIRS=$withval; CPPFLAGS="-I$withval $CPPFLAGS"], + [ICONV_INCLUDE_DIRS=$withval], [ICONV_INCLUDE_DIRS=]) AC_ARG_WITH([iconv-libraries], diff --git a/libraries/ghc-bignum/gmp/ghc.mk b/libraries/ghc-bignum/gmp/ghc.mk index fe8ba7c171..9a7ae88577 100644 --- a/libraries/ghc-bignum/gmp/ghc.mk +++ b/libraries/ghc-bignum/gmp/ghc.mk @@ -124,9 +124,12 @@ libraries/ghc-bignum/gmp/libgmp.a libraries/ghc-bignum/gmp/gmp.h: # Note: We must pass `TARGETPLATFORM` to the `--host` argument of GMP's # `./configure`, not `HOSTPLATFORM`: the 'host' on which GMP will # run is the 'target' platform of the compiler we're building. + # Note2: we pass --with-readline=no, to prevent getting an indirect + # dependency on ncurses through gmp. readline is only relevant + # for gmp test programs. (See gmp's configure) cd libraries/ghc-bignum/gmp/gmpbuild; \ CC=$(CCX) CXX=$(CCX) NM=$(NM) AR=$(AR_STAGE1) ./configure \ - --enable-shared=no --with-pic=yes \ + --enable-shared=no --with-pic=yes --with-readline=no \ --host=$(TARGETPLATFORM) --build=$(BUILDPLATFORM) $(MAKE) -C libraries/ghc-bignum/gmp/gmpbuild MAKEFLAGS= $(CP) libraries/ghc-bignum/gmp/gmpbuild/gmp.h libraries/ghc-bignum/gmp/ |