<pre style='margin:0'>
Landon Fuller (landonf) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e5eef1d8b89b4b55413546ea8c587e12f34834fa">https://github.com/macports/macports-ports/commit/e5eef1d8b89b4b55413546ea8c587e12f34834fa</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e5eef1d8b89b4b55413546ea8c587e12f34834fa
</span>Author: Landon Fuller <landonf@macports.org>
AuthorDate: Wed Sep 9 16:17:55 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> kremlin(-devel): use a wrapper script to exec ${configure.cc}
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This avoids breaking toolchain wrappers that use argv[0] to determine
</span><span style='display:block; white-space:pre;color:#404040;'> the tool to be executed and would otherwise by confused by our symlinks
</span><span style='display:block; white-space:pre;color:#404040;'> (e.g. clang-10 -> /usr/bin/clang).
</span>---
lang/fstar/Portfile | 7 +++++--
lang/fstar/files/krml-cc.in | 2 ++
2 files changed, 7 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/fstar/Portfile b/lang/fstar/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bf0b9dac576..7fd31e0a357 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/fstar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/fstar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -353,11 +353,14 @@ if {${fstar.project} eq "fstar"} {
</span>
post-patch {
file mkdir "${workpath}/compiler-bin"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -shf ${configure.cc} ${workpath}/compiler-bin/${kremlin.cc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set krml_cc ${workpath}/compiler-bin/${kremlin.cc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 ${filespath}/krml-cc.in ${krml_cc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@CONFIGURE_CC@|${configure.cc}|g" ${krml_cc}
</span>
# XXX: Must be kept in-sync with Driver.detect_gnu()
foreach {cc_major} {5 6 7 8 9 10} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -shf ${configure.cc} ${workpath}/compiler-bin/${kremlin.cc}-${cc_major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -shf ${krml_cc} ${krml_cc}-${cc_major}
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/fstar/files/krml-cc.in b/lang/fstar/files/krml-cc.in
</span>new file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1b2eb72c139
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/fstar/files/krml-cc.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,2 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#!/bin/sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+exec "@CONFIGURE_CC@" "$@"
</span></pre><pre style='margin:0'>
</pre>