Skip to content

Commit 9ad1357

Browse files
committed
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
1 parent bf3b97e commit 9ad1357

File tree

4 files changed

+4
-11
lines changed

4 files changed

+4
-11
lines changed

.travis.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ notifications:
5656
- http://julia.mit.edu:8000/travis-hook
5757
before_install:
5858
- make check-whitespace
59-
- JULIA_SYSIMG_BUILD_FLAGS="--output-ji ../usr/lib/julia/sys.ji"
6059
- if [ `uname` = "Linux" ]; then
6160
contrib/travis_fastfail.sh || exit 1;
6261
mkdir -p $HOME/bin;
@@ -93,7 +92,7 @@ script:
9392
- make -C moreutils mispipe
9493
- make $BUILDOPTS -C base version_git.jl.phony
9594
- moreutils/mispipe "make $BUILDOPTS NO_GIT=1 -C deps" bar > deps.log || cat deps.log
96-
- make $BUILDOPTS NO_GIT=1 JULIA_SYSIMG_BUILD_FLAGS="$JULIA_SYSIMG_BUILD_FLAGS" prefix=/tmp/julia install | moreutils/ts -s "%.s"
95+
- make $BUILDOPTS NO_GIT=1 prefix=/tmp/julia install | moreutils/ts -s "%.s"
9796
- make $BUILDOPTS NO_GIT=1 build-stats
9897
- du -sk /tmp/julia/*
9998
- if [ `uname` = "Darwin" ]; then
@@ -102,8 +101,8 @@ script:
102101
done;
103102
fi
104103
- cd .. && mv julia julia2
105-
- cp /tmp/julia/lib/julia/sys.ji local.ji && /tmp/julia/bin/julia -J local.ji -e 'true' &&
106-
/tmp/julia/bin/julia-debug -J local.ji -e 'true' && rm local.ji
104+
- /tmp/julia/bin/julia --precompiled=no -e 'true' &&
105+
/tmp/julia/bin/julia-debug --precompiled=no -e 'true'
107106
- /tmp/julia/bin/julia -e 'versioninfo()'
108107
- export JULIA_CPU_CORES=2 && export JULIA_TEST_MAXRSS_MB=600 && cd /tmp/julia/share/julia/test &&
109108
/tmp/julia/bin/julia --check-bounds=yes runtests.jl $TESTSTORUN &&

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ build_script:
5353

5454
test_script:
5555
- usr\bin\julia -e "versioninfo()"
56-
- copy usr\lib\julia\sys.ji local.ji && usr\bin\julia -J local.ji -e "true" && del local.ji
56+
- usr\bin\julia --precompiled=no -e "true"
5757
- cd test && ..\usr\bin\julia --check-bounds=yes runtests.jl all &&
5858
..\usr\bin\julia --check-bounds=yes runtests.jl libgit2-online pkg

contrib/windows/msys_build.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ for lib in SUITESPARSE ARPACK BLAS LAPACK FFTW \
166166
done
167167
echo 'override LIBLAPACK = $(LIBBLAS)' >> Make.user
168168
echo 'override LIBLAPACKNAME = $(LIBBLASNAME)' >> Make.user
169-
echo 'JULIA_SYSIMG_BUILD_FLAGS=--output-ji ../usr/lib/julia/sys.ji' >> Make.user
170169

171170
# Remaining dependencies:
172171
# libuv since its static lib is no longer included in the binaries

src/init.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,7 @@ jl_options_t jl_options = { 0, // quiet
7373
JL_OPTIONS_FAST_MATH_DEFAULT,
7474
0, // worker
7575
JL_OPTIONS_HANDLE_SIGNALS_ON,
76-
#ifdef _OS_WINDOWS_
77-
// TODO remove this when using LLVM 3.5+
78-
JL_OPTIONS_USE_PRECOMPILED_NO,
79-
#else
8076
JL_OPTIONS_USE_PRECOMPILED_YES,
81-
#endif
8277
JL_OPTIONS_USE_COMPILECACHE_YES,
8378
NULL, // bindto
8479
NULL, // outputbc

0 commit comments

Comments
 (0)