@@ -85,37 +85,6 @@ case $(uname) in
85
85
;;
86
86
esac
87
87
88
- # Download most recent Julia binary for dependencies
89
- if ! [ -e julia-installer.exe ]; then
90
- f=julia-latest-win$bits .exe
91
- echo " Downloading $f "
92
- $curlflags -O https://julialangnightlies-s3.julialang.org/bin/winnt/x$archsuffix /$f
93
- echo " Extracting $f "
94
- $SEVENZIP x -y $f >> get-deps.log
95
- fi
96
- mkdir -p usr
97
- for i in bin/* .dll; do
98
- $SEVENZIP e -y julia-installer.exe " $i " \
99
- -ousr\\ ` dirname $i | sed -e ' s|/julia||' -e ' s|/|\\\\|g' ` >> get-deps.log
100
- done
101
- for i in share/julia/base/pcre_h.jl; do
102
- $SEVENZIP e -y julia-installer.exe " $i " -obase >> get-deps.log
103
- # Touch the file to adjust the modification time, thereby (hopefully) avoiding
104
- # issues with clock skew during the build
105
- touch " base/$( basename $i ) "
106
- done
107
- echo " override PCRE_INCL_PATH =" >> Make.user
108
- # Remove libjulia.dll if it was copied from downloaded binary
109
- rm -f usr/bin/libjulia.dll
110
- rm -f usr/bin/libjulia-debug.dll
111
- rm -f usr/bin/libgcc_s_s* -1.dll
112
- rm -f usr/bin/libgfortran-3.dll
113
- rm -f usr/bin/libquadmath-0.dll
114
- rm -f usr/bin/libssp-0.dll
115
- rm -f usr/bin/libstdc++-6.dll
116
- rm -f usr/bin/libccalltest.dll
117
- rm -f usr/bin/libpthread.dll
118
-
119
88
if [ -z " $USEMSVC " ]; then
120
89
if [ -z " ` which ${CROSS_COMPILE} gcc 2> /dev/null` " ]; then
121
90
f=$ARCH -4.9.2-release-win32-$exc -rt_v4-rev3.7z
@@ -163,20 +132,6 @@ if [ -z "`which make 2>/dev/null`" ]; then
163
132
export PATH=$PWD /bin:$PATH
164
133
fi
165
134
166
-
167
- for lib in SUITESPARSE ARPACK BLAS LAPACK \
168
- GMP MPFR PCRE LIBUNWIND; do
169
- echo " USE_SYSTEM_$lib = 1" >> Make.user
170
- done
171
- echo ' override LIBLAPACK = $(LIBBLAS)' >> Make.user
172
- echo ' override LIBLAPACKNAME = $(LIBBLASNAME)' >> Make.user
173
-
174
- # Remaining dependencies:
175
- # libuv since its static lib is no longer included in the binaries
176
- # openlibm since we need it as a static library to work properly
177
- # utf8proc since its headers are not in the binary download
178
- echo ' override DEP_LIBS = libuv utf8proc' >> Make.user
179
-
180
135
if [ -n " $USEMSVC " ]; then
181
136
# Openlibm doesn't build well with MSVC right now
182
137
echo ' USE_SYSTEM_OPENLIBM = 1' >> Make.user
0 commit comments