Fix regex escaping in old-configure and js/src/old-configure

This commit is contained in:
JustOff 2018-05-04 17:28:00 +03:00 • committed by Roy Tam
commit 401655260c
2 changed files with 5 additions and 1 deletions

View file

@ -740,12 +740,14 @@ case "$target" in
dnl VS2012+ defaults to -arch:SSE2. We want to target nothing dnl VS2012+ defaults to -arch:SSE2. We want to target nothing
dnl more recent, so set that explicitly here unless another dnl more recent, so set that explicitly here unless another
dnl target arch has already been set. dnl target arch has already been set.
changequote(,)
if test -z `echo $CFLAGS | grep -i [-/]arch:` ; then if test -z `echo $CFLAGS | grep -i [-/]arch:` ; then
CFLAGS="$CFLAGS -arch:SSE2" CFLAGS="$CFLAGS -arch:SSE2"
fi fi
if test -z `echo $CXXFLAGS | grep -i [-/]arch:` ; then if test -z `echo $CXXFLAGS | grep -i [-/]arch:` ; then
CXXFLAGS="$CXXFLAGS -arch:SSE2" CXXFLAGS="$CXXFLAGS -arch:SSE2"
fi fi
changequote([,])
fi fi
dnl VS2013+ requires -FS when parallel building by make -jN. dnl VS2013+ requires -FS when parallel building by make -jN.
dnl If nothing, compiler sometimes causes C1041 error. dnl If nothing, compiler sometimes causes C1041 error.

View file

@ -1035,12 +1035,14 @@ case "$target" in
dnl VS2012+ defaults to -arch:SSE2. We want to target nothing dnl VS2012+ defaults to -arch:SSE2. We want to target nothing
dnl more recent, so set that explicitly here unless another dnl more recent, so set that explicitly here unless another
dnl target arch has already been set. dnl target arch has already been set.
changequote(,)
if test -z `echo $CFLAGS | grep -i [-/]arch:`; then if test -z `echo $CFLAGS | grep -i [-/]arch:`; then
CFLAGS="$CFLAGS -arch:SSE2" CFLAGS="$CFLAGS -arch:SSE2"
fi fi
if test -z `echo $CXXFLAGS | grep -i [-/]arch:`; then if test -z `echo $CXXFLAGS | grep -i [-/]arch:`; then
CXXFLAGS="$CXXFLAGS -arch:SSE2" CXXFLAGS="$CXXFLAGS -arch:SSE2"
fi fi
changequote([,])
SSE_FLAGS="-arch:SSE" SSE_FLAGS="-arch:SSE"
SSE2_FLAGS="-arch:SSE2" SSE2_FLAGS="-arch:SSE2"
dnl MSVC allows the use of intrinsics without any flags dnl MSVC allows the use of intrinsics without any flags