Revision: 140806 https://trac.macports.org/changeset/140806 Author: mcalhoun@macports.org Date: 2015-10-03 09:06:47 -0700 (Sat, 03 Oct 2015) Log Message: ----------- mono: ensure we are UsingTheRightCompiler Modified Paths: -------------- trunk/dports/devel/mono/Portfile Modified: trunk/dports/devel/mono/Portfile =================================================================== --- trunk/dports/devel/mono/Portfile 2015-10-03 16:05:46 UTC (rev 140805) +++ trunk/dports/devel/mono/Portfile 2015-10-03 16:06:47 UTC (rev 140806) @@ -5,6 +5,7 @@ name mono version 3.12.1 +revision 1 categories devel lang mono platforms darwin license {GPL-2 LGPL-2 MIT} @@ -33,6 +34,8 @@ port:libgdiplus \ port:xorg-libX11 +# Save value of ${configure.cc} for use in patching files +set configure_cc ${configure.cc} # Do NOT pick up external boehmgc (prefixing CPPFLAGS or CFLAGS does not suffice -- ugly++) configure.cc-append "-I${worksrcpath}/libgc/include" @@ -56,6 +59,10 @@ configure.args-append "--host=i686-apple-${os.platform}${os.version}" } +# Ensure we are UsingTheRightCompiler (https://trac.macports.org/wiki/UsingTheRightCompiler) +patchfiles-append patch-aot-compiler.c.diff \ + patch-Makefile.in.diff + post-patch { if {${os.major} < 9} { reinplace "s:MAC_OS_X_VERSION_10_5:1050:g" \ @@ -70,6 +77,10 @@ reinplace "s/ctx->__/ctx->/g" \ ${worksrcpath}/mono/utils/mach-support-x86.c } + + # Ensure we are UsingTheRightCompiler (https://trac.macports.org/wiki/UsingTheRightCompiler) + reinplace "s:__MACPORTS_CC__:${configure_cc}:g" \ + ${worksrcpath}/mono/mini/aot-compiler.c } post-destroot {