Changeset 80265

Timestamp:

07/07/11 23:54:53 (4 years ago)

Author:

jeremyhu@…

Message:

apple-gcc42: Use our preferred compiler to build our stage1 compiler

Location:

trunk/dports/lang/apple-gcc42

Files:

• Portfile (modified) (5 diffs)
• files/stage1-cc.patch (added)

trunk/dports/lang/apple-gcc42/Portfile

@@ -36 +36 @@
 # prefix.patch             : Fix hardcoded instances of /usr
 # suffix.patch             : Make binaries end in -apple-4.2
+# stage1-cc.patch          : Use $CC for our stage1 compiler
 # makeinfo.patch           : Fix version detection for makeinfo in configure scripts
 # werror-*.patch           : Fix compilation errors when building for x86_64
@@ -44 +45 @@
         suffix.patch \
         makeinfo.patch \
+        stage1-cc.patch \
         werror-c-incpath.patch \
         werror-local-alloc.patch
@@ -53 +55 @@
         # arch returns i386 even when we want x86_64
         reinplace "/^BUILD=/ s:arch:echo ${build_arch}:" ${worksrcpath}/build_gcc
-
-        # Use our CC
-        # TODO: This seems insufficient as "gcc" is still being used
-        reinplace "/^unset CC/ s:^:#:" ${worksrcpath}/build_gcc
 
         # ppc not tested, but it should hopefully work...
@@ -68 +66 @@
                 reinplace "/^PPC_SYSROOT=/ s:=.*$:=${developer_dir}/SDKs/MacOSX10.3.9.sdk:" ${worksrcpath}/build_gcc
         }
+
+        # Disable -Werror for our bootstrap gcc
+        if {${configure.compiler} == "clang" ||
+            ${configure.compiler} == "macports-clang"} {
+                reinplace "s:--enable-werror : :" ${worksrcpath}/build_gcc
+        }
 }
 
 # TODO: Use MacPorts dependencies
 build.env \
-        CC="${configure.cc}" \
-        LIBRARY_PATH="/usr/lib" \
-        CPATH="/usr/include" \
+        LIBRARY_PATH="/usr/lib" \
+        CPATH="/usr/include" \
         PATH="/bin:/usr/bin:/sbin:/usr/sbin"
 
@@ -80 +83 @@
 
 build.args-append \
+        CC="${configure.cc} -std=gnu89" \
         PREFIX="${prefix}" \
         SRCROOT="${srcroot}" \