diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-05-04 17:55:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-04 17:55:14 +0200 |
| commit | 175efcbab02bbfea84e565cdea9ee96d6436a08f (patch) | |
| tree | 916b8bd3dcb65d4589d78a02ae7fca691b47dfb5 | |
| parent | 78310fd7c43d06768a40f0d507e23103fe4ac2bf (diff) | |
| parent | adf982f3cb42be25c01301d107d90c3a8a9ce179 (diff) | |
| download | UXP-175efcbab02bbfea84e565cdea9ee96d6436a08f.tar UXP-175efcbab02bbfea84e565cdea9ee96d6436a08f.tar.gz UXP-175efcbab02bbfea84e565cdea9ee96d6436a08f.tar.lz UXP-175efcbab02bbfea84e565cdea9ee96d6436a08f.tar.xz UXP-175efcbab02bbfea84e565cdea9ee96d6436a08f.zip | |
Merge pull request #327 from JustOff/PR_grep_invalid_option
Fix regex escaping in old-configure and js/src/old-configure
| -rw-r--r-- | js/src/old-configure.in | 4 | ||||
| -rw-r--r-- | old-configure.in | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/js/src/old-configure.in b/js/src/old-configure.in index 162a071d7..8abea5956 100644 --- a/js/src/old-configure.in +++ b/js/src/old-configure.in @@ -734,12 +734,14 @@ case "$target" in dnl VS2012+ defaults to -arch:SSE2. We want to target nothing dnl more recent, so set that explicitly here unless another dnl target arch has already been set. + changequote(,) if test -z `echo $CFLAGS | grep -i [-/]arch:` ; then CFLAGS="$CFLAGS -arch:SSE2" - fi + fi if test -z `echo $CXXFLAGS | grep -i [-/]arch:` ; then CXXFLAGS="$CXXFLAGS -arch:SSE2" fi + changequote([,]) fi dnl VS2013+ requires -FS when parallel building by make -jN. dnl If nothing, compiler sometimes causes C1041 error. diff --git a/old-configure.in b/old-configure.in index cc49c3fce..731509c46 100644 --- a/old-configure.in +++ b/old-configure.in @@ -1030,12 +1030,14 @@ case "$target" in dnl VS2012+ defaults to -arch:SSE2. We want to target nothing dnl more recent, so set that explicitly here unless another dnl target arch has already been set. + changequote(,) if test -z `echo $CFLAGS | grep -i [-/]arch:`; then CFLAGS="$CFLAGS -arch:SSE2" fi if test -z `echo $CXXFLAGS | grep -i [-/]arch:`; then CXXFLAGS="$CXXFLAGS -arch:SSE2" fi + changequote([,]) SSE_FLAGS="-arch:SSE" SSE2_FLAGS="-arch:SSE2" dnl MSVC allows the use of intrinsics without any flags |