Fix GCCBootstrapMacOS

We can't do a bootstrapped build because it's canadian cross.

Author: staticfloat

bootstrap/GCC/gcc_common.jl

@@ -148,14 +148,6 @@ done
 # Initialize GCC_CONF_ARGS
 GCC_CONF_ARGS=()
 
-## If we're doing a bootstrapping build (GCC does not, GCCBootstrapMacOS does)
-# add in the appropriate configure arguments:
-if [[ "${GCC_ENABLE_BOOTSTRAP:-false}" == "true" ]]; then
-    GCC_CONF_ARGS+=( --enable-bootstrap )
-else
-    GCC_CONF_ARGS+=( --disable-bootstrap )
-fi
-
 ## Architecture-dependent arguments
 # Choose a default arch, and on arm*hf targets, pass `--with-float=hard` explicitly
 if [[ "${target}" == arm*hf ]]; then
@@ -243,10 +235,10 @@ for TOOL in CC CPP CXX AS AR NM LD RANLIB; do
     export ${TOOL}_FOR_TARGET=${!TARGET_NAME}
 
     # These target tool autodetections do not work
-    #export ac_cv_path_${TOOL}_FOR_TARGET=${!TARGET_NAME}
+    export ac_cv_path_${TOOL}_FOR_TARGET=${!TARGET_NAME}
 done
 
-# libcc1 fails with an error about `-rdynamic` unless we defien this
+# libcc1 fails with an error about `-rdynamic` unless we define this
 export gcc_cv_nm="${NM_FOR_TARGET}"
 
 # Make sure the tools that GCC itself wants to use ("ld", "as", "dysmutil") are available
@@ -269,6 +261,7 @@ $WORKSPACE/srcdir/gcc-*/configure \
     --host="${host}" \
     --target="${target}" \
     --disable-multilib \
+    --disable-bootstrap \
     --disable-werror \
     --enable-threads=posix \
     --enable-languages=c,c++ \

bootstrap/GCCBootstrapMacOS/build_tarballs.jl

@@ -10,14 +10,7 @@ for version in (v"14.2.0",)
             gcc_version_sources[version]...,
             DirectorySource("./patches-v$(version)"; follow_symlinks=true, target="patches"),
         ],
-        script = string(
-            """
-            # By setting `GCC_ENABLE_BOOTSTRAP=true`, we opt-in to
-            # a bootstrapped GCC build and disable trying to use the target CToolchain
-            GCC_ENABLE_BOOTSTRAP=true
-            """,
-            script,
-        ),
+        script,
         platforms = [
             CrossPlatform(Platform(arch(HostPlatform()), "linux") => Platform("aarch64", "macos")),
             CrossPlatform(Platform(arch(HostPlatform()), "linux") => Platform("x86_64", "macos")),