don't mix arm64 and x86_64 builds

common_utils.sh

@@ -276,28 +276,32 @@ function run_command_universal2 {
     fi
     if [[ "${PLAT:-}" == "universal2" ]]; then
         export PLAT_BACKUP="universal2"
-        export PLAT="x86_64"
-        export _PYTHON_HOST_PLATFORM="macosx-10.9-x86_64"
-        export CFLAGS+=" -arch x86_64"
-        export CXXFLAGS+=" -arch x86_64"
-        export ARCHFLAGS+=" -arch x86_64"
-        $@
-
+        (
+          export PLAT="x86_64"
+          export _PYTHON_HOST_PLATFORM="macosx-10.9-x86_64"
+          export CFLAGS+=" -arch x86_64"
+          export CXXFLAGS+=" -arch x86_64"
+          export ARCHFLAGS+=" -arch x86_64"
+          export CPPFLAGS+=" -arch x86_64"
+          export LDFLAGS+=" -arch x86_64"
+          $@
+        )
         rm -rf *-stamp
-        export PLAT="arm64"
     fi
     if [[ "${PLAT:-}" == "universal2" || "${PLAT:-}" == "arm64" ]]; then
+        export PLAT="arm64"
         export BUILD_PREFIX=/opt/arm64-builds
         sudo mkdir -p $BUILD_PREFIX
         sudo chown -R $USER $BUILD_PREFIX
+        update_env_for_build_prefix
         export _PYTHON_HOST_PLATFORM="macosx-11.0-arm64"
-        export CFLAGS+=" -arch arm64 -I$BUILD_PREFIX/include"
-        export CXXFLAGS+=" -arch arm64 -I$BUILD_PREFIX/include"
+        export CFLAGS+=" -arch arm64"
+        export CXXFLAGS+=" -arch arm64"
+        export CPPFLAGS+=" -arch arm64"
         export ARCHFLAGS+=" -arch arm64"
-        export LDFLAGS+=" -arch arm64 -L$BUILD_PREFIX/lib -Wl,-rpath,$BUILD_PREFIX/lib ${FC_ARM64_LDFLAGS:-}"
         export FCFLAGS+=" -arch arm64"
         export FC=$FC_ARM64
-        export host_alias="aarch64-apple-darwin20.0.0"
+        export LDFLAGS+=" -arch arm64 -L$BUILD_PREFIX/lib -Wl,-rpath,$BUILD_PREFIX/lib ${FC_ARM64_LDFLAGS:-}"
         $@
         export PLAT="$PLAT_BACKUP"
     else

configure_build.sh

@@ -58,9 +58,18 @@ else
     fi
 fi
 
-# Promote BUILD_PREFIX on search path to any newly built libs
-export CPPFLAGS="-I$BUILD_PREFIX/include $CPPFLAGS"
-export LIBRARY_PATH="$BUILD_PREFIX/lib:$LIBRARY_PATH"
-export PKG_CONFIG_PATH="$BUILD_PREFIX/lib/pkgconfig/:$PKG_CONFIG_PATH"
-# Add binary path for configure utils etc
-export PATH="$BUILD_PREFIX/bin:$PATH"
+export CPPFLAGS_BACKUP="$CPPFLAGS"
+export LIBRARY_PATH_BACKUP="$LIBRARY_PATH"
+export PKG_CONFIG_PATH_BACKUP="$PKG_CONFIG_PATH"
+export PATH_BACKUP="$PATH"
+
+function update_env_for_build_prefix {
+  # Promote BUILD_PREFIX on search path to any newly built libs
+  export CPPFLAGS="-I$BUILD_PREFIX/include $CPPFLAGS_BACKUP"
+  export LIBRARY_PATH="$BUILD_PREFIX/lib:$LIBRARY_PATH_BACKUP"
+  export PKG_CONFIG_PATH="$BUILD_PREFIX/lib/pkgconfig/:$PKG_CONFIG_PATH_BACKUP"
+  # Add binary path for configure utils etc
+  export PATH="$BUILD_PREFIX/bin:$PATH_BACKUP"
+}
+
+update_env_for_build_prefix