<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/533032e45b857cd448baa438a27cda068885feea">https://github.com/macports/macports-ports/commit/533032e45b857cd448baa438a27cda068885feea</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 533032e45b857cd448baa438a27cda068885feea
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Mar 19 08:12:23 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> muniversal PG: all merger flags for more languages
</span>---
_resources/port1.0/group/muniversal-1.0.tcl | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/muniversal-1.0.tcl b/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 10f08ff..920f29c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,6 +15,10 @@
</span> # merger_configure_cflags: associative array of configure.cflags
# merger_configure_cxxflags: associative array of configure.cxxflags
# merger_configure_objcflags: associative array of configure.objcflags
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# merger_configure_objcxxflags: associative array of configure.objcxxflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# merger_configure_fflags: associative array of configure.fflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# merger_configure_f90flags: associative array of configure.f90flags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# merger_configure_fcflags: associative array of configure.fcflags
</span> # merger_configure_ldflags: associative array of configure.ldflags
# merger_arch_flag: if no, -arch xxx will not be appended configure.???flags
# merger_arch_compiler: if no, -arch xxx will not be appended to compilers
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,13 +100,13 @@ variant universal {
</span> global universal_archs_to_use
foreach arch ${universal_archs} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach lang {c cxx ld} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach lang {c cxx objc objcxx cpp ld} {
</span> configure.universal_${lang}flags-delete -arch ${arch}
}
}
configure.args-append {*}${configure.universal_args}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach lang {c cxx objc cpp ld} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach lang {c cxx objc objcxx cpp ld} {
</span> configure.${lang}flags-append {*}[option configure.universal_${lang}flags]
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -225,7 +229,7 @@ variant universal {
</span> if { [info exists merger_configure_env(${arch})] } {
configure.env-append {*}$merger_configure_env(${arch})
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach lang {cpp c cxx objc ld} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach lang {c f cxx objc objcxx cpp f90 fc ld} {
</span> if { [info exists merger_configure_${lang}flags(${arch})] } {
configure.${lang}flags-prepend {*}[set merger_configure_${lang}flags(${arch})]
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -352,7 +356,7 @@ variant universal {
</span> configure.args-delete {*}$merger_configure_args(${arch})
}
configure.args-delete ${host}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach lang {ld cxx objc c cpp} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach lang {ld fc f90 cpp objcxx objc cxx f c} {
</span> if { [info exists merger_configure_${lang}flags(${arch})] } {
configure.${lang}flags-delete {*}[set merger_configure_${lang}flags(${arch})]
}
</pre><pre style='margin:0'>
</pre>