<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d06b6981b2d767d286cf2b4d939377c9d160aca9">https://github.com/macports/macports-ports/commit/d06b6981b2d767d286cf2b4d939377c9d160aca9</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d06b6981b2d767d286cf2b4d939377c9d160aca9
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Apr 25 16:38:08 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> ghc: ensure build is UsingTheRightCompiler
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://trac.macports.org/wiki/UsingTheRightCompiler
</span>---
lang/ghc/Portfile | 6 ++++++
lang/ghc/files/patch-gmp-ghc.mk.diff | 11 +++++++++++
2 files changed, 17 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ghc/Portfile b/lang/ghc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ef1e945..930ddbe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ghc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ghc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -168,6 +168,12 @@ if { [variant_isset "prebuilt"] } {
</span> ${f}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/wiki/UsingTheRightCompiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append CC=${configure.cc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX=${configure.cxx}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${srcpath}/${distname} "patch -p0 < ${filespath}/patch-gmp-ghc.mk.diff"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> system -W ${srcpath}/${distname} \
"export PATH=$env(PATH):${bootstrap_dir}/bin:${frameworks_dir}/Python.framework/Versions/${python3_version}/bin ;\
./boot"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ghc/files/patch-gmp-ghc.mk.diff b/lang/ghc/files/patch-gmp-ghc.mk.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..fb83f8e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ghc/files/patch-gmp-ghc.mk.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libraries/integer-gmp/gmp/ghc.mk.orig 2019-11-23 13:27:35.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libraries/integer-gmp/gmp/ghc.mk 2020-04-25 10:45:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -130,7 +130,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # `./configure`, not `HOSTPLATFORM`: the 'host' on which GMP will
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # run is the 'target' platform of the compiler we're building.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd libraries/integer-gmp/gmp/gmpbuild; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CC=$(CCX) CXX=$(CCX) NM=$(NM) AR=$(AR_STAGE1) ./configure \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NM=$(NM) AR=$(AR_STAGE1) ./configure \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-shared=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --host=$(TARGETPLATFORM) --build=$(BUILDPLATFORM)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(MAKE) -C libraries/integer-gmp/gmp/gmpbuild MAKEFLAGS=
</span></pre><pre style='margin:0'>
</pre>