Skip to content

Commit fb5c743

Browse files
Bugfixes in build scripts
1 parent 66636ea commit fb5c743

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

linux-build-mex.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# When using flatpak, the following RSYNC variable should be used.
2222
RSYNC="flatpak-spawn --host rsync"
2323
# Otherwise, the RSYNC variable should be set to
24-
#RSYNC=rsync
24+
RSYNC=rsync
2525
#
2626

2727
# Any subsequent commands which fail will cause the shell script to exit immediately
@@ -209,7 +209,7 @@ done
209209
for LIB in fastsum
210210
do
211211
cd "$LIB"
212-
"$GCCINSTALLDIR/bin/gcc-$GCCVERSION" -shared -fPIC -DPIC .libs/lib"$LIB"julia.o -Wl,--whole-archive ../../applications/fastsum/.libs/libfastsum$THREADSSUFFIX.a ../../applications/fastsum/.libs/libkernels.a ../../.libs/libnfft3_julia.a $GOMPLIBSTATIC -Wl,--no-whole-archive -O3 -malign-double -march="$GCCARCH" -Wl,-soname -Wl,lib"$LIB"julia.so -o .libs/lib"$LIB"julia.so
212+
"$GCCINSTALLDIR/bin/gcc-$GCCVERSION" -shared -fPIC -DPIC .libs/lib"$LIB"julia.o -Wl,--whole-archive ../../applications/fastsum/.libs/libfastsum$THREADSSUFFIX.a ../../applications/fastsum/.libs/libkernels.a ../../.libs/libnfft3_julia.a $FFTWLIBSTATIC $GOMPLIBSTATIC -Wl,--no-whole-archive -O3 -malign-double -march="$GCCARCH" -Wl,-soname -Wl,lib"$LIB"julia.so -o .libs/lib"$LIB"julia.so
213213
cd ..
214214
done
215215
cd "$NFFTBUILDDIR"
@@ -239,7 +239,7 @@ if [ -n "$MATLABDIR" ]; then
239239
MATLABVERSION=`"$MATLABDIR"/bin/matlab -nodisplay -r "fprintf('MATLAB_VERSION=%s\n', version); exit;" | grep MATLAB_VERSION | sed 's/.*(//' | sed 's/)//'`
240240
cd "$NFFTBUILDDIR"
241241
make clean
242-
CC="$GCCINSTALLDIR/bin/gcc-$GCCVERSION" "$NFFTDIR/configure" --enable-all $OMPFLAG --with-matlab="$MATLABDIR" --with-gcc-arch="$GCCARCH" --disable-static --enable-shared
242+
CC="$GCCINSTALLDIR/bin/gcc-$GCCVERSION" "$NFFTDIR/configure" --enable-all $OMPFLAG --with-matlab="$MATLABDIR" --with-gcc-arch="$GCCARCH" --disable-static --enable-shared --enable-exhaustive-unit-tests
243243
make
244244
if [ $OMPYN = 1 ]; then
245245
cd matlab

macos-build-mex.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ if [ -n "$MATLABDIR" ]; then
148148
fi
149149
cd "$NFFTBUILDDIR"
150150
make clean
151-
CC=$GCC CPPFLAGS=-I"$FFTWDIR"/include LDFLAGS=-L"$FFTWDIR"/lib "$NFFTDIR/configure" --enable-all $OMPFLAG --with-matlab="$MATLABDIR" --with-gcc-arch=$GCCARCH --disable-static --enable-shared --disable-examples --disable-applications
151+
CC=$GCC CPPFLAGS=-I"$FFTWDIR"/include LDFLAGS=-L"$FFTWDIR"/lib "$NFFTDIR/configure" --enable-all $OMPFLAG --with-matlab="$MATLABDIR" --with-gcc-arch=$GCCARCH --disable-static --enable-shared --disable-examples --disable-applications --enable-exhaustive-unit-tests
152152
make
153153
make check
154154
for LIB in nfft nfsft nfsoft nnfft fastsum nfct nfst fpt

0 commit comments

Comments
 (0)