From 71b4d5ece8be172db398384eae85da6ffc5ebdf0 Mon Sep 17 00:00:00 2001
From: Jameson Nash <vtjnash@gmail.com>
Date: Tue, 28 Jun 2016 23:29:07 -0400
Subject: [PATCH] set precompiled=yes by default on windows

also fix the test for this to actually test for this,
instead of injecting a non-default build configuration
in order to test for something that bootstrapping is already testing

fix #16953
---
 .travis.yml                   | 7 +++----
 appveyor.yml                  | 2 +-
 contrib/windows/msys_build.sh | 1 -
 src/init.c                    | 5 -----
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 91a4a35d643fd..cc87e6ca68b39 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,7 +56,6 @@ notifications:
           - http://julia.mit.edu:8000/travis-hook
 before_install:
     - make check-whitespace
-    - JULIA_SYSIMG_BUILD_FLAGS="--output-ji ../usr/lib/julia/sys.ji"
     - if [ `uname` = "Linux" ]; then
         contrib/travis_fastfail.sh || exit 1;
         mkdir -p $HOME/bin;
@@ -93,7 +92,7 @@ script:
     - make -C moreutils mispipe
     - make $BUILDOPTS -C base version_git.jl.phony
     - moreutils/mispipe "make $BUILDOPTS NO_GIT=1 -C deps" bar > deps.log || cat deps.log
-    - make $BUILDOPTS NO_GIT=1 JULIA_SYSIMG_BUILD_FLAGS="$JULIA_SYSIMG_BUILD_FLAGS" prefix=/tmp/julia install | moreutils/ts -s "%.s"
+    - make $BUILDOPTS NO_GIT=1 prefix=/tmp/julia install | moreutils/ts -s "%.s"
     - make $BUILDOPTS NO_GIT=1 build-stats
     - du -sk /tmp/julia/*
     - if [ `uname` = "Darwin" ]; then
@@ -102,8 +101,8 @@ script:
         done;
       fi
     - cd .. && mv julia julia2
-    - cp /tmp/julia/lib/julia/sys.ji local.ji && /tmp/julia/bin/julia -J local.ji -e 'true' &&
-        /tmp/julia/bin/julia-debug -J local.ji -e 'true' && rm local.ji
+    - /tmp/julia/bin/julia --precompiled=no -e 'true' &&
+      /tmp/julia/bin/julia-debug --precompiled=no -e 'true'
     - /tmp/julia/bin/julia -e 'versioninfo()'
     - export JULIA_CPU_CORES=2 && export JULIA_TEST_MAXRSS_MB=600 && cd /tmp/julia/share/julia/test &&
         /tmp/julia/bin/julia --check-bounds=yes runtests.jl $TESTSTORUN &&
diff --git a/appveyor.yml b/appveyor.yml
index be1fa0d55b214..b417243521f8b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -53,6 +53,6 @@ build_script:
 
 test_script:
   - usr\bin\julia -e "versioninfo()"
-  - copy usr\lib\julia\sys.ji local.ji && usr\bin\julia -J local.ji -e "true" && del local.ji
+  - usr\bin\julia --precompiled=no -e "true"
   - cd test && ..\usr\bin\julia --check-bounds=yes runtests.jl all &&
       ..\usr\bin\julia --check-bounds=yes runtests.jl libgit2-online pkg
diff --git a/contrib/windows/msys_build.sh b/contrib/windows/msys_build.sh
index fdb29f7711eed..aefa0b2864868 100755
--- a/contrib/windows/msys_build.sh
+++ b/contrib/windows/msys_build.sh
@@ -166,7 +166,6 @@ for lib in SUITESPARSE ARPACK BLAS LAPACK FFTW \
 done
 echo 'override LIBLAPACK = $(LIBBLAS)' >> Make.user
 echo 'override LIBLAPACKNAME = $(LIBBLASNAME)' >> Make.user
-echo 'JULIA_SYSIMG_BUILD_FLAGS=--output-ji ../usr/lib/julia/sys.ji' >> Make.user
 
 # Remaining dependencies:
 # libuv since its static lib is no longer included in the binaries
diff --git a/src/init.c b/src/init.c
index 6b794c68cf2bf..bf0a45448c2fe 100644
--- a/src/init.c
+++ b/src/init.c
@@ -73,12 +73,7 @@ jl_options_t jl_options = { 0,    // quiet
                             JL_OPTIONS_FAST_MATH_DEFAULT,
                             0,    // worker
                             JL_OPTIONS_HANDLE_SIGNALS_ON,
-#ifdef _OS_WINDOWS_
-// TODO remove this when using LLVM 3.5+
-                            JL_OPTIONS_USE_PRECOMPILED_NO,
-#else
                             JL_OPTIONS_USE_PRECOMPILED_YES,
-#endif
                             JL_OPTIONS_USE_COMPILECACHE_YES,
                             NULL, // bindto
                             NULL, // outputbc