Ticket #33836: doxygen-get_canonical_archflags.diff

Portfile

@@ -48 +48 @@
 
 post-patch {
         # ensure correct compilers and compiler options are used
-        reinplace "/^TMAKE_CC\[\[:space:\]\]/s%=.*%= ${configure.cc} ${configure.cppflags} ${arch_flags}%" ${tmake_conf}
-        reinplace "/^TMAKE_CXX\[\[:space:\]\]/s%=.*%= ${configure.cxx} ${configure.cppflags} ${arch_flags}%" ${tmake_conf}
-        reinplace "/^TMAKE_LINK\[\[:space:\]\]/s%=.*%= ${configure.cxx} ${configure.ldflags} ${arch_flags}%" ${tmake_conf}
-        reinplace "/^TMAKE_LINK_SHLIB\[\[:space:\]\]/s%=.*%= ${configure.cxx} ${arch_flags}%" ${tmake_conf}
+        reinplace "/^TMAKE_CC\[\[:space:\]\]/s%=.*%= ${configure.cc} ${configure.cppflags} [get_canonical_archflags cc]%" ${tmake_conf}
+        reinplace "/^TMAKE_CXX\[\[:space:\]\]/s%=.*%= ${configure.cxx} ${configure.cppflags} [get_canonical_archflags cxx]%" ${tmake_conf}
+        reinplace "/^TMAKE_LINK\[\[:space:\]\]/s%=.*%= ${configure.cxx} ${configure.ldflags} [get_canonical_archflags ld]%" ${tmake_conf}
+        reinplace "/^TMAKE_LINK_SHLIB\[\[:space:\]\]/s%=.*%= ${configure.cxx} [get_canonical_archflags ld]%" ${tmake_conf}
 
         # may not be strictly necessary, but remove trailing '/' from DESTDIR
         reinplace "s|\$(DESTDIR)/|\$(DESTDIR)|g" ${worksrcpath}/Makefile.in
@@ -134 +134 @@
 
 platform darwin {
         # Specify the platform explicitly to avoid a universal build.
-        global tmake_conf arch_flags
+        global tmake_conf
 
                 set tmake_conf  ${worksrcpath}/tmake/lib/macosx-c++/tmake.conf
                 configure.args-append   --platform macosx-c++
-        if { ![variant_isset universal] } {
-                set arch_flags ${configure.cc_archflags}
-        } else {
-                set arch_flags ${configure.universal_cflags}
-        }
 }