Revision
91449
Author
jeremyhu@macports.org
Date
2012-04-01 22:34:12 -0700 (Sun, 01 Apr 2012)

Log Message

apple-gcc42: Clean up +universal

limit universal to same architecture since ppc doesn't build on intel
Note that this is just for the host architecture.  It still can target
ppc.

Modified Paths

Diff

Modified: trunk/dports/lang/apple-gcc42/Portfile (91448 => 91449)


--- trunk/dports/lang/apple-gcc42/Portfile	2012-04-02 04:59:05 UTC (rev 91448)
+++ trunk/dports/lang/apple-gcc42/Portfile	2012-04-02 05:34:12 UTC (rev 91449)
@@ -50,7 +50,15 @@
 depends_run             port:gcc_select
 
 use_configure no
+variant universal {}
 
+# Building universal with a ppc slice doesn't work (Tried on Leopard)
+if {${build_arch} == "i686" || ${build_arch} == "x86_64"} {
+    supported_archs i386 x86_64
+} elseif {${build_arch} == "ppc" || ${build_arch} == "ppc64"} {
+    supported_archs ppc ppc64
+}
+
 select.group    gcc
 select.file     ${filespath}/${name}
 
@@ -161,20 +169,9 @@
 	SYMROOT="${symroot}" \
 	DSTROOT="${destroot}" \
 	RC_NONARCH_CFLAGS="-pipe -std=gnu89" \
-	RC_OS="macos"
+	RC_OS="macos" \
+	RC_ARCHS="[get_canonical_archs]"
 
-# +universal is failing to build in some cases.
-# https://trac.macports.org/ticket/31603
-#universal_variant       no
-universal_variant       yes
-if {[variant_isset universal]} {
-	build.args-append \
-		RC_ARCHS="${universal_archs}"
-} else {
-	build.args-append \
-		RC_ARCHS="${build_arch}"
-}
-
 set build_targets {i386}
 
 # Support for PPC was dropped in Darwin 11 (Mac OS X 10.7)