Ticket #31957: makeicns.diff

Portfile

@@ -33 +33 @@
 variant universal {
 }
 
-if {[variant_isset universal]} {
-    set archflags ${configure.universal_cflags}
-} else {
-    set archflags ${configure.cc_archflags}
-}
-
 build.env-append    CC=${configure.cc} \
                     CXX=${configure.cxx} \
-                    CFLAGS="${configure.cflags} ${archflags}" \
-                    CXXFLAGS="${configure.cxxflags} ${archflags}" \
-                    LDFLAGS="[join ${configure.ldflags}] ${archflags}"
+                    CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
+                    CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
+                    LDFLAGS="[join ${configure.ldflags}] [get_canonical_archflags ld]"
 
 if {${configure.sdkroot} != ""} {
     build.env-append SDK=${configure.sdkroot}