<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/c4eb8f0b5d0f0424c540bb2fcb98439ff801089d">https://github.com/macports/macports-ports/commit/c4eb8f0b5d0f0424c540bb2fcb98439ff801089d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c4eb8f0b5d0f0424c540bb2fcb98439ff801089d
</span>Author: Landon Fuller <landonf@macports.org>
AuthorDate: Tue Aug 4 22:54:17 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> kremlin-devel: use the correct compiler
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/60793
</span>---
lang/fstar/Portfile | 33 ++++++++++++++++++++++++++++++++-
1 file changed, 32 insertions(+), 1 deletion(-)
<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 c05e88917d4..b4512016e1a 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;'>@@ -138,6 +138,21 @@ if {${fstar.project} eq "fstar"} {
</span>
kremlin.bin krml
kremlin.doc_dirs examples
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ options kremlin.cc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kremlin.ccpath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kremlin.ccpath {${configure.compiler}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # XXX TODO: We really need a ${configure.compiler.family}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string match *clang* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kremlin.cc clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[string match *gcc* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kremlin.cc gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Assume GCC-like behavior
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kremlin.cc gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> } else {
ui_error "Unsupported project: ${fstar.project}"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -329,12 +344,28 @@ if {${fstar.project} eq "fstar"} {
</span> #
# If we exclude it, we can rely on auto-detection of kremlin.home, which
# allows us to run krml in-place (e.g. for tests)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args FSTAR_HOME=${fstar.home}/home \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FSTAR_HOME=${fstar.home}/home \
</span> KREMLIN_HOME=${worksrcpath}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append PATH=${workpath}/compiler-bin:$env(PATH) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "KREMLIN_ARGS=-cc ${kremlin.cc}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir "${workpath}/compiler-bin"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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;'>+ # XXX: Must be kept in-sync with Driver.detect_gnu()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach {cc_major} {5 6 7 8 9 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -shf ${configure.cc} ${workpath}/compiler-bin/${kremlin.cc}-${cc_major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> test.run yes
test.args {*}${build.args} \
-j ${build.jobs}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.env-append PATH=${workpath}/compiler-bin:$env(PATH) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "KOPTS=-cc ${kremlin.cc}"
</span>
destroot.args PREFIX=${destroot}${kremlin.home} \
FSTAR_HOME=${fstar.home}/home \
</pre><pre style='margin:0'>
</pre>