builder: fix regressions from 3786944..a3ec309

Refactor the build environment evaluation, make build variables set immediately so that they don't grow longer on re-evaluations and defer all other variables. Export as many build related variables as possible. Make one more crucial fix for cross builds: run the post_build after LDFLAGS and LIBS are restored, so that this does not interfere with setting and restoring the build environment for host builds. Other changes: - fontconfig 2.13.0 -> 2.13.1 - openal 1.19.0 -> 1.19.1 - set fontconfig configure type to autoreconf, disable tests - disable the openssl parallel build patch, it fails unpredictably, always build openssl with -j1 - configure libicu with --disable-tests and a few other things disabled, the tests cause link issues on mingw i686 - also make a minor fix to libicu makefiles for mingw (replace echo -n with printf) - move $BUILD_ENV evaluation to the builder() main function to defer some variable initializations - add patch for openal to mingw-cross to use gcc instead of cmake to build some native tools it uses, cmake causes issues with cross builds - in host_env()/target_env() defer variable expansion and include a copy of $BUILD_ENV in the appropriate sequence
visualboyadvance-m · Nov 15, 2018 · b9911a5 · b9911a5
1 parent a3ec309
commit b9911a5
Show file tree

Hide file tree

Showing 10 changed files with 165 additions and 176 deletions.
diff --git a/tools/builder/core.sh b/tools/builder/core.sh
diff --git a/tools/builder/mingw-cross.sh b/tools/builder/mingw-cross.sh
@@ -55,9 +55,11 @@ export LDFLAGS="-L/usr/${target_arch}/usr/lib${lib_suffix} $LDFLAGS"
 EOF
 )
 
-REQUIRED_CONFIGURE_ARGS="--host=${target_arch}"
+export BUILD_ENV
 
-REQUIRED_CMAKE_ARGS="$REQUIRED_CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE='$(perl -MCwd=abs_path -le "print abs_path(q{${0%/*}/../../cmake/Toolchain-cross-MinGW-w64-${target_cpu}.cmake})")'"
+export REQUIRED_CONFIGURE_ARGS="--host=${target_arch}"
+
+export REQUIRED_CMAKE_ARGS="$REQUIRED_CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE='$(perl -MCwd=abs_path -le "print abs_path(q{${0%/*}/../../cmake/Toolchain-cross-MinGW-w64-${target_cpu}.cmake})")'"
 
 . "${0%/*}/../builder/mingw.sh"
 
@@ -68,7 +70,10 @@ table_line_replace DIST_CONFIGURE_OVERRIDES openssl-target "./Configure $openssl
 
 table_line_append DIST_PRE_BUILD bzip2-target ':; sed -i.bak '\''s,include <sys\\stat.h>,include <sys/stat.h>,g'\'' *.c;'
 
-table_line_append DIST_ARGS libicu-target "--with-cross-build=$BUILD_ROOT/dists/libicu/source"
+table_line_append DIST_ARGS libicu-target "--with-cross-build=\$BUILD_ROOT/dists/libicu/source"
+
+# the native tools openal uses for building can be problematic when cross-compiling
+table_line_append DIST_PATCHES openal '-p0 https://gist.githubusercontent.com/rkitover/d371d199ee0ac67864d0940aa7e7c12c/raw/29f3bc4afaba41b35b3fcbd9d18d1f0a22e3dc13/openal-cross-no-cmake-for-native-tools.patch'
 
 table_line_replace DIST_POST_BUILD harfbuzz "$(table_line DIST_POST_BUILD harfbuzz | sed 's/rebuild_dist freetype /rebuild_dist freetype-target /')"
 
@@ -79,14 +84,14 @@ table_line_append DIST_ARGS libsoxr '-DHAVE_WORDS_BIGENDIAN_EXITCODE=0'
 vpx_target=x86-win32-gcc
 [ "$target_bits" -eq 64 ] && vpx_target=x86_64-win64-gcc
 
-table_line_replace DIST_CONFIGURE_OVERRIDES libvpx "./configure --target=$vpx_target $CONFIGURE_ARGS $(table_line DIST_ARGS libvpx)"
+table_line_replace DIST_CONFIGURE_OVERRIDES libvpx "./configure --target=$vpx_target \$CONFIGURE_ARGS $(table_line DIST_ARGS libvpx)"
 
 table_line_remove  DIST_ARGS                libvpx
 
 table_line_replace DIST_CONFIGURE_OVERRIDES ffmpeg "\
     ./configure --arch=$target_cpu --target-os=mingw32 --cross-prefix=${target_arch}- \
-        --pkg-config='$BUILD_ROOT/host/bin/pkg-config' \
-        $CONFIGURE_ARGS $(table_line DIST_ARGS ffmpeg) \
+        --pkg-config='\$BUILD_ROOT/host/bin/pkg-config' \
+        \$CONFIGURE_ARGS $(table_line DIST_ARGS ffmpeg) \
 "
 
 table_line_remove  DIST_ARGS                ffmpeg
diff --git a/tools/builder/mingw.sh b/tools/builder/mingw.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-CROSS_OS=windows
+export CROSS_OS=windows
 
 [ -n "$BUILD_ENV" ] && eval "$BUILD_ENV"
 
@@ -17,20 +17,20 @@ export LIBS="-lpthread -lm"
 
 export UUID_LIBS="-luuid_mingw -luuid"
 
-export PKG_CONFIG="$BUILD_ROOT/root/bin/pkg-config"
+export PKG_CONFIG="\$BUILD_ROOT/root/bin/pkg-config"
 
 EOF
 )
 
+export BUILD_ENV
+
 : ${HOST_CC:=ccache gcc}
 : ${HOST_CXX:=ccache g++}
-: ${HOST_CC_ORIG:=gcc}
-: ${HOST_CXX_ORIG:=g++}
-: ${HOST_CPPFLAGS:="-I$BUILD_ROOT/root/include"}
-: ${HOST_CFLAGS:="-fPIC -I$BUILD_ROOT/root/include -L$BUILD_ROOT/root/lib -pthread -lm"}
-: ${HOST_CXXFLAGS:="-fPIC -I$BUILD_ROOT/root/include -L$BUILD_ROOT/root/lib -std=gnu++11 -fpermissive -pthread -lm"}
-: ${HOST_OBJCXXFLAGS:="-fPIC -I$BUILD_ROOT/root/include -L$BUILD_ROOT/root/lib -std=gnu++11 -fpermissive -pthread -lm"}
-: ${HOST_LDFLAGS:="-fPIC -L$BUILD_ROOT/root/lib -pthread -lm"}
+: ${HOST_CPPFLAGS:="-I\$BUILD_ROOT/root/include"}
+: ${HOST_CFLAGS:="-fPIC -I\$BUILD_ROOT/root/include -L\$BUILD_ROOT/root/lib -pthread -lm"}
+: ${HOST_CXXFLAGS:="-fPIC -I\$BUILD_ROOT/root/include -L\$BUILD_ROOT/root/lib -std=gnu++11 -fpermissive -pthread -lm"}
+: ${HOST_OBJCXXFLAGS:="-fPIC -I\$BUILD_ROOT/root/include -L\$BUILD_ROOT/root/lib -std=gnu++11 -fpermissive -pthread -lm"}
+: ${HOST_LDFLAGS:="-fPIC -L\$BUILD_ROOT/root/lib -pthread -lm"}
 : ${HOST_LIBS:=-lm}
 : ${HOST_UUID_LIBS:=}
 : ${HOST_STRIP:=strip}
@@ -76,24 +76,22 @@ host_env() {
     ln -sf "$BUILD_ROOT/host" "$BUILD_ROOT/root"
     if [ -z "$OCC" ]; then
         cat <<EOF
-OCC="$CC"
-OCXX="$CXX"
-OCC_ORIG="$CC_ORIG"
-OCXX_ORIG="$CXX_ORIG"
-OCPPFLAGS="$CPPFLAGS"
-OCFLAGS="$CFLAGS"
-OCXXFLAGS="$CXXFLAGS"
-OOBJCXXFLAGS="$OBJCXXFLAGS"
-OLDFLAGS="$LDFLAGS"
-OLIBS="$LIBS"
-OUUID_LIBS="$UUID_LIBS"
-OSTRIP="$STRIP"
-OPATH="$PATH"
+OCC="\$CC"
+OCXX="\$CXX"
+OCPPFLAGS="\$CPPFLAGS"
+OCFLAGS="\$CFLAGS"
+OCXXFLAGS="\$CXXFLAGS"
+OOBJCXXFLAGS="\$OBJCXXFLAGS"
+OLDFLAGS="\$LDFLAGS"
+OLIBS="\$LIBS"
+OUUID_LIBS="\$UUID_LIBS"
+OSTRIP="\$STRIP"
+OPATH="\$PATH"
+
+$BUILD_ENV
 
 export CC="$HOST_CC"
 export CXX="$HOST_CXX"
-export CC_ORIG="$HOST_CC_ORIG"
-export CXX_ORIG="$HOST_CXX_ORIG"
 export CPPFLAGS="$HOST_CPPFLAGS"
 export CFLAGS="$HOST_CFLAGS"
 export CXXFLAGS="$HOST_CXXFLAGS"
@@ -102,13 +100,13 @@ export LDFLAGS="$HOST_LDFLAGS"
 export LIBS="$HOST_LIBS"
 export UUID_LIBS="$HOST_UUID_LIBS"
 export STRIP="$HOST_STRIP"
-export PATH="$BUILD_ROOT/host/bin:$PATH"
+export PATH="$BUILD_ROOT/host/bin:\$PATH"
 
-OREQUIRED_CONFIGURE_ARGS="$REQUIRED_CONFIGURE_ARGS"
-OREQUIRED_CMAKE_ARGS="$REQUIRED_CMAKE_ARGS"
+OREQUIRED_CONFIGURE_ARGS="\$REQUIRED_CONFIGURE_ARGS"
+OREQUIRED_CMAKE_ARGS="\$REQUIRED_CMAKE_ARGS"
 
-REQUIRED_CONFIGURE_ARGS="$(puts "$REQUIRED_CONFIGURE_ARGS" | sed 's/--host[^ ]*//g')"
-REQUIRED_CMAKE_ARGS="$(puts "$REQUIRED_CMAKE_ARGS" | sed 's/-DCMAKE_TOOLCHAIN_FILE=[^ ]*//g')"
+REQUIRED_CONFIGURE_ARGS="\$(puts "\$REQUIRED_CONFIGURE_ARGS" | sed 's/--host[^ ]*//g')"
+REQUIRED_CMAKE_ARGS="\$(puts "\$REQUIRED_CMAKE_ARGS" | sed 's/-DCMAKE_TOOLCHAIN_FILE=[^ ]*//g')"
 EOF
     fi
 
@@ -121,24 +119,24 @@ target_env() {
 
     if [ -n "$OCC" ]; then
         cat <<EOF
-export CC="$OCC"
-export CXX="$OCXX"
-export CC_ORIG="$OCC_ORIG"
-export CXX_ORIG="$OCXX_ORIG"
-export CPPFLAGS="$OCPPFLAGS"
-export CFLAGS="$OCFLAGS"
-export CXXFLAGS="$OCXXFLAGS"
-export OBJCXXFLAGS="$OOBJCXXFLAGS"
-export LDFLAGS="$OLDFLAGS"
-export LIBS="$OLIBS"
-export UUID_LIBS="$OUUID_LIBS"
-export STRIP="$OSTRIP"
-export PATH="$OPATH"
-OCC= OCXX= OCC_ORIG= OCXX_ORIG= OCPPFLAGS= OCFLAGS= OCXXFLAGS= OOBJCXXFLAGS= OLDFLAGS= OLIBS= OUUID_LIBS= OSTRIP= OPATH=
-
-REQUIRED_CONFIGURE_ARGS="$OREQUIRED_CONFIGURE_ARGS"
-REQUIRED_CMAKE_ARGS="$OREQUIRED_CMAKE_ARGS"
+export CC="\$OCC"
+export CXX="\$OCXX"
+export CPPFLAGS="\$OCPPFLAGS"
+export CFLAGS="\$OCFLAGS"
+export CXXFLAGS="\$OCXXFLAGS"
+export OBJCXXFLAGS="\$OOBJCXXFLAGS"
+export LDFLAGS="\$OLDFLAGS"
+export LIBS="\$OLIBS"
+export UUID_LIBS="\$OUUID_LIBS"
+export STRIP="\$OSTRIP"
+export PATH="\$OPATH"
+OCC= OCXX= OCPPFLAGS= OCFLAGS= OCXXFLAGS= OOBJCXXFLAGS= OLDFLAGS= OLIBS= OUUID_LIBS= OSTRIP= OPATH=
+
+REQUIRED_CONFIGURE_ARGS="\$OREQUIRED_CONFIGURE_ARGS"
+REQUIRED_CMAKE_ARGS="\$OREQUIRED_CMAKE_ARGS"
 OREQUIRED_CONFIGURE_ARGS= OREQUIRED_CMAKE_ARGS=
+
+$BUILD_ENV
 EOF
     fi
 
@@ -260,7 +258,7 @@ table_line_append DIST_PATCHES $libicu " \
     https://raw.githubusercontent.com/Alexpux/MINGW-packages/master/mingw-w64-icu/0021-mingw-static-libraries-without-s.patch \
 "
 
-table_line_append DIST_EXTRA_LDFLAGS $libicu "-ldl -lcatgets -lws2_32"
+table_line_append DIST_PRE_BUILD $libicu ":; sed -E -i.bak 's/@echo -n /@printf \"%s\" /g' config/mh-mingw*;"
 
 table_insert_after DISTS libiconv-target '
     catgets         https://downloads.sourceforge.net/project/mingw/MinGW/Extension/catgets/mingw-catgets-1.0.1/mingw-catgets-1.0.1-src.tar.gz    include/langinfo.h
@@ -282,20 +280,15 @@ table_line_append DIST_PATCHES fontconfig-target " \
     https://raw.githubusercontent.com/Alexpux/MINGW-packages/master/mingw-w64-fontconfig/0007-pkgconfig.mingw.patch \
 "
 
-table_line_replace DIST_CONFIGURE_TYPES fontconfig-target autoreconf
-
 table_line_append DIST_PATCHES libgd 'https://gist.githubusercontent.com/rkitover/c64ea5b83ddea94ace58c40c7de42879/raw/fbaf4885fbefb302116b56626c0e191df514e8c6/libgd-2.2.4-mingw-static.patch'
 
 table_insert_before DISTS sfml '
-    openal          https://github.com/kcat/openal-soft/archive/openal-soft-1.19.0.tar.gz                      lib/libOpenAL32.a
+    openal          https://github.com/kcat/openal-soft/archive/openal-soft-1.19.1.tar.gz                      lib/libOpenAL32.a
 '
 
 table_line_append DIST_ARGS openal '-DLIBTYPE=STATIC -DALSOFT_UTILS=OFF -DALSOFT_EXAMPLES=OFF -DALSOFT_TESTS=OFF'
 
-# this is necessary so the native tools openal uses to build compile when cross-compiling
-table_line_append DIST_PRE_BUILD openal ":; sed -i.bak 's/\\(-G \"\\\${CMAKE_GENERATOR}\"\\)/\\1 -DCMAKE_C_COMPILER=cc -DCMAKE_CXX_COMPILER=c++ -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \"-DCMAKE_C_LINK_EXECUTABLE=<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS>  -o <TARGET> <LINK_LIBRARIES> -lm\" \"-DCMAKE_CXX_LINK_EXECUTABLE=<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS>  -o <TARGET> <LINK_LIBRARIES> -lm\" -DCMAKE_C_FLAGS= -DCMAKE_CXX_FLAGS= -DCMAKE_EXE_LINKER_FLAGS=/' CMakeLists.txt;"
-
-table_line_replace DIST_ARGS mp3lame "LDFLAGS='$LDFLAGS $BUILD_ROOT/root/lib/libcatgets.a'"
+table_line_replace DIST_ARGS mp3lame "LDFLAGS='\$LDFLAGS \$BUILD_ROOT/root/lib/libcatgets.a'"
 
 table_line_replace DIST_CONFIGURE_TYPES     zlib-target cmake
 table_line_append  DIST_ARGS                zlib-target -DUNIX=1
@@ -347,13 +340,13 @@ table_line_append DIST_PATCHES libtheora "\
 "
 
 table_line_append DIST_PRE_BUILD  wxwidgets ":; \
-    if path_exists $BUILD_ROOT/root/include/langinfo.h; then \
-        mv $BUILD_ROOT/root/include/langinfo.h $BUILD_ROOT/root/include/langinfo.bak; \
+    if path_exists \$BUILD_ROOT/root/include/langinfo.h; then \
+        mv \$BUILD_ROOT/root/include/langinfo.h \$BUILD_ROOT/root/include/langinfo.bak; \
     fi;
 "
 
 table_line_append DIST_POST_BUILD  wxwidgets ":; \
-    if path_exists $BUILD_ROOT/root/include/langinfo.bak; then \
-        mv $BUILD_ROOT/root/include/langinfo.bak $BUILD_ROOT/root/include/langinfo.h; \
+    if path_exists \$BUILD_ROOT/root/include/langinfo.bak; then \
+        mv \$BUILD_ROOT/root/include/langinfo.bak \$BUILD_ROOT/root/include/langinfo.h; \
     fi;
 "
diff --git a/tools/builder/unix.sh b/tools/builder/unix.sh
@@ -1,15 +1,16 @@
 set -e
 
-: ${BUILD_ROOT:=$HOME/vbam-build-unix}
+export BUILD_ROOT="${BUILD_ROOT:-$HOME/vbam-build-unix}"
 
 BUILD_ENV=$BUILD_ENV$(cat <<EOF
 
-export LDFLAGS="$LDFLAGS -Wl,--start-group -ldl"
+export LDFLAGS="$LDFLAGS${LDFLAGS:+ }-Wl,--start-group -ldl"
 
 EOF
 )
 
-eval "$BUILD_ENV"
+export BUILD_ENV
+
 . "$(dirname "$0")/../builder/core.sh"
 
 # on mac openal is part of the system, on most unixes we need openal-soft
@@ -114,9 +115,9 @@ table_line_append DIST_ARGS libdrm '--disable-cairo-tests'
 
 table_line_append DIST_ARGS freeglut '-DFREEGLUT_BUILD_SHARED_LIBS=NO -DFREEGLUT_BUILD_STATIC_LIBS=YES'
 
-table_line_append DIST_ARGS gtk-doc "--with-xml-catalog='$BUILD_ROOT/root/etc/xml/catalog.xml'"
+table_line_append DIST_ARGS gtk-doc "--with-xml-catalog=\"\$BUILD_ROOT/root/etc/xml/catalog.xml\""
 
-table_line_append DIST_POST_BUILD gtk-doc ":; sed -i.bak 's|^prefix=/usr$|prefix=$BUILD_ROOT/root|' $BUILD_ROOT/root/bin/gtkdocize"
+table_line_append DIST_POST_BUILD gtk-doc ":; sed -i.bak \"s|^prefix=/usr\\\$|prefix=\$BUILD_ROOT/root|\" \"\$BUILD_ROOT/root/bin/gtkdocize\""
 
 table_line_replace DIST_BUILD_OVERRIDES gobject-introspection ':; cp m4/introspection.m4 "$BUILD_ROOT/root/share/aclocal";'
 

diff --git a/tools/linux/builder b/tools/linux/builder
@@ -2,7 +2,7 @@
 
 set -e
 
-: ${BUILD_ROOT:=$HOME/vbam-build-linux}
+export BUILD_ROOT="${BUILD_ROOT:=$HOME/vbam-build-linux}"
 
 . "$(dirname "$0")/../builder/unix.sh"
 
@@ -35,11 +35,11 @@ table_line_append DIST_ARGS libudev '-Dlink-udev-shared=false'
 table_line_append DIST_MAKE_ARGS libudev 'src/udev/libudev.a'
 
 table_line_append DIST_INSTALL_OVERRIDES libudev " \
-    mkdir -p '$BUILD_ROOT/root/lib/pkgconfig'; \
-    mkdir -p '$BUILD_ROOT/root/include'; \
-    cp -a src/udev/libudev.a '$BUILD_ROOT/root/lib'; \
-    cp -a src/libudev/libudev.pc '$BUILD_ROOT/root/pkgconfig'; \
-    cp -a ../src/libudev/libudev.h '$BUILD_ROOT/root/include'; \
+    mkdir -p \"\$BUILD_ROOT/root/lib/pkgconfig\"; \
+    mkdir -p \"\$BUILD_ROOT/root/include\"; \
+    cp -a src/udev/libudev.a \"\$BUILD_ROOT/root/lib\"; \
+    cp -a src/libudev/libudev.pc \"\$BUILD_ROOT/root/pkgconfig\"; \
+    cp -a ../src/libudev/libudev.h \"\$BUILD_ROOT/root/include\"; \
 "
 
 builder "$@"
diff --git a/tools/osx/builder b/tools/osx/builder
@@ -27,7 +27,7 @@ case "$1" in
         ;;
 esac
 
-BUILD_ROOT=$HOME/vbam-build-mac-${target_bits}bit
+export BUILD_ROOT="$HOME/vbam-build-mac-${target_bits}bit"
 
 BUILD_ENV=$(cat <<EOF
 export MACOSX_DEPLOYMENT_TARGET=10.7
@@ -45,10 +45,11 @@ export UUID_LIBS="-L\$BUILD_ROOT/root/stow/libuuid/lib -luuid"
 EOF
 )
 
-TAR=tar
+export BUILD_ENV
+export TAR=tar
 
 if [ "$target_cpu" = i386 ]; then
-    REQUIRED_CONFIGURE_ARGS='--host=i386-apple-darwin --build=x86_64-apple-darwin'
+    export REQUIRED_CONFIGURE_ARGS='--host=i386-apple-darwin --build=x86_64-apple-darwin'
 fi
 
 . "$(dirname "$0")/../builder/core.sh"
@@ -100,7 +101,7 @@ table_line_append  DIST_PRE_BUILD       libmodplug " \
 table_line_append DIST_PRE_BUILD libzmq "sed -i.bak 's/-lstdc++/-lc++/g' src/libzmq.pc.in"
 table_line_append DIST_PRE_BUILD ffmpeg "sed -i.bak 's/-lstdc++/-lc++/g' configure"
 
-table_line_append DIST_ARGS wxwidgets  "--with-macosx-version-min=$MACOSX_DEPLOYMENT_TARGET LDFLAGS='$LDFLAGS -stdlib=libc++'"
+table_line_append DIST_ARGS wxwidgets  "--with-macosx-version-min=\$MACOSX_DEPLOYMENT_TARGET LDFLAGS=\"\$LDFLAGS -stdlib=libc++\""
 table_line_append DIST_ARGS ffmpeg     "--disable-videotoolbox --extra-ldflags='-framework CoreText'"
 table_line_append DIST_ARGS libmodplug "CC=clang++ CXX=clang++"
 

diff --git a/tools/unix/builder b/tools/unix/builder
@@ -2,7 +2,7 @@
 
 set -e
 
-BUILD_ROOT=$HOME/vbam-build-unix
+export BUILD_ROOT="$HOME/vbam-build-unix"
 
 . "$(dirname "$0")/../builder/core.sh"
 

diff --git a/tools/win/cygwin-cross-builder b/tools/win/cygwin-cross-builder
@@ -24,15 +24,12 @@ if [ "$(uname -o 2>/dev/null || :)" = Cygwin ]; then
     fi
 fi
 
-REQUIRED_CMAKE_ARGS="-DGETTEXT_MSGFMT_EXECUTABLE:FILEPATH=\"\$BUILD_ROOT/host/bin/msgfmt\" -DGETTEXT_MSGMERGE_EXECUTABLE=\"\$BUILD_ROOT/host/bin/msgmerge\""
+export REQUIRED_CMAKE_ARGS="-DGETTEXT_MSGFMT_EXECUTABLE:FILEPATH=\"\$BUILD_ROOT/host/bin/msgfmt\" -DGETTEXT_MSGMERGE_EXECUTABLE=\"\$BUILD_ROOT/host/bin/msgmerge\""
 
 . "${0%/*}/../builder/mingw-cross.sh"
 
 table_line_append DIST_MAKE_ARGS unzip 'CFLAGS="$CFLAGS -DNO_LCHMOD"'
 
-# parallel build of openssl doesn't work for cygwin layer
-table_line_append DIST_MAKE_ARGS openssl -j1
-
 # FIXME: problems with autopoint that need to be sorted
 table_line_remove DISTS flex
 

diff --git a/tools/win/mac-cross-builder b/tools/win/mac-cross-builder
@@ -2,7 +2,7 @@
 
 set -e
 
-TAR=tar
+export TAR=tar
 
 . "${0%/*}/../builder/mingw-cross.sh"
 
@@ -11,13 +11,11 @@ host_env_hook() {
 export COMMAND_MODE=unix2003
 export CC='ccache clang'
 export CXX='ccache clang++'
-export CC_ORIG=clang
-export CXX_ORIG=clang++
-export CPPFLAGS="-I$BUILD_ROOT/root/include -DICONV_CONST="
-export CFLAGS="-fPIC -I$BUILD_ROOT/root/include -L$BUILD_ROOT/root/lib -framework Carbon -framework Foundation -framework CoreServices -Wno-unused-command-line-argument -DICONV_CONST= -Wl,-no_compact_unwind"
-export CXXFLAGS="-fPIC -I$BUILD_ROOT/root/include -L$BUILD_ROOT/root/lib -std=gnu++11 -fpermissive -stdlib=libc++ -framework Carbon -framework Foundation -framework CoreServices -Wno-unused-command-line-argument -DICONV_CONST= -Wl,-no_compact_unwind"
-export OBJCXXFLAGS="-fPIC -I$BUILD_ROOT/root/include -L$BUILD_ROOT/root/lib -std=gnu++11 -fpermissive -stdlib=libc++ -framework Carbon -framework Foundation -framework CoreServices -Wno-unused-command-line-argument -DICONV_CONST= -Wl,-no_compact_unwind"
-export LDFLAGS="-fPIC -L$BUILD_ROOT/root/lib -framework Carbon -framework Foundation -framework CoreServices -Wno-unused-command-line-argument -Wl,-no_compact_unwind"
+export CPPFLAGS="-I\$BUILD_ROOT/root/include -DICONV_CONST="
+export CFLAGS="-fPIC -I\$BUILD_ROOT/root/include -L\$BUILD_ROOT/root/lib -framework Carbon -framework Foundation -framework CoreServices -Wno-unused-command-line-argument -DICONV_CONST= -Wl,-no_compact_unwind"
+export CXXFLAGS="-fPIC -I\$BUILD_ROOT/root/include -L\$BUILD_ROOT/root/lib -std=gnu++11 -fpermissive -stdlib=libc++ -framework Carbon -framework Foundation -framework CoreServices -Wno-unused-command-line-argument -DICONV_CONST= -Wl,-no_compact_unwind"
+export OBJCXXFLAGS="-fPIC -I\$BUILD_ROOT/root/include -L\$BUILD_ROOT/root/lib -std=gnu++11 -fpermissive -stdlib=libc++ -framework Carbon -framework Foundation -framework CoreServices -Wno-unused-command-line-argument -DICONV_CONST= -Wl,-no_compact_unwind"
+export LDFLAGS="-fPIC -L\$BUILD_ROOT/root/lib -framework Carbon -framework Foundation -framework CoreServices -Wno-unused-command-line-argument -Wl,-no_compact_unwind"
 EOF
 }