From 7237708a1f2bfe7f297fbd7ea292b0547567081b Mon Sep 17 00:00:00 2001 From: Brannon King Date: Wed, 6 Feb 2019 13:46:33 -0700 Subject: [PATCH] tweak windows build just a bit --- packaging/build_windows.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/packaging/build_windows.sh b/packaging/build_windows.sh index bab0b1633..5001b8615 100755 --- a/packaging/build_windows.sh +++ b/packaging/build_windows.sh @@ -18,10 +18,10 @@ icu_linux_dir=$staging_dir/build_icu_linux mkdir -p $staging_dir pushd $staging_dir wget -c http://download.icu-project.org/files/icu4c/57.1/icu4c-57_1-src.tgz -tar -xvzf icu4c-57_1-src.tgz +tar -xzf icu4c-57_1-src.tgz pushd icu/source -CC="gcc" CXX="g++" ./runConfigureICU Linux --prefix=$icu_linux_dir --enable-extras=no --enable-strict=no -enable-static --enable-shared=no --enable-tests=no --enable-samples=no --enable-dyload=no -make +CC="gcc" CXX="g++" ./runConfigureICU Linux --prefix=$icu_linux_dir --enable-extras=no --enable-strict=no --enable-static --enable-shared=no --enable-tests=no --enable-samples=no --enable-dyload=no +make -j4 make install popd popd @@ -30,21 +30,23 @@ pushd depends # Remove the dir saying that dependencies are built (although ccache # is still enabled). rm -rf built +mkdir -p sources +cp "$staging_dir/icu4c-57_1-src.tgz" sources/ # Build and install the cross compiled ICU package. -make HOST=i686-w64-mingw32 NO_QT=1 ICU_ONLY=1 +make -j4 HOST=i686-w64-mingw32 NO_QT=1 ICU_ONLY=1 # Then build the rest of the dependencies (now that it exists and we # can determine the location for it). icu_mingw_dir=$(find /tmp/icu_install -name i686-w64-mingw32 -type d) -make HOST=i686-w64-mingw32 NO_QT=1 ICU_DIR=$icu_mingw_dir +make -j4 HOST=i686-w64-mingw32 NO_QT=1 ICU_DIR=$icu_mingw_dir V=1 popd ./autogen.sh echo "Using --with-icu=$icu_mingw_dir" PREFIX=`pwd`/depends/i686-w64-mingw32 CC="i686-w64-mingw32-gcc" CXX="i686-w64-mingw32-g++" ./configure --prefix=$PREFIX --host=i686-w64-mingw32 --build=i686-w64-mingw32 --without-gui --with-icu=$icu_mingw_dir --enable-static --disable-shared -make -j12 +make -j4 rm -rf $staging_dir # Remove hardcoded cross compiled ICU package path.