Changeset 82708

Timestamp:

08/18/11 13:17:40 (4 years ago)

Author:

ryandesign@…

Message:

lua: simplify setting archflags

File:

• trunk/dports/lang/lua/Portfile (modified) (1 diff)

trunk/dports/lang/lua/Portfile

@@ -51 +51 @@
 
 configure {
-    set myldflags ${configure.ldflags}
-    set cflags "${configure.cflags} ${configure.cppflags}"
-
-    if {[variant_isset universal]} {
-        set myldflags "${myldflags} ${configure.universal_ldflags}"
-        set cflags "${cflags} ${configure.universal_cflags} ${configure.universal_cppflags}"
-    } else {
-        set myldflags "${myldflags} ${configure.ld_archflags}"
-        set cflags "${cflags} ${configure.cc_archflags}"
-    }
-
-    reinplace -E "/^MYLDFLAGS=/s|\$| ${myldflags}|" ${worksrcpath}/src/Makefile
-    reinplace -E "/^CFLAGS=/s|\$| ${cflags}|" ${worksrcpath}/src/Makefile
+    reinplace -E "/^MYLDFLAGS=/s|\$| ${configure.ldflags} [get_canonical_archflags]|" ${worksrcpath}/src/Makefile
+    reinplace -E "/^CFLAGS=/s|\$| ${configure.cflags} ${configure.cppflags} [get_canonical_archflags]|" ${worksrcpath}/src/Makefile
     reinplace "s|CC= .*\$|CC= ${configure.cc}|" ${worksrcpath}/src/Makefile
 }