Bug 1340393 - Remove unnecessary -FS option. r=glandium
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Fri, 17 Feb 2017 13:07:26 +0900
changeset 372955 e7c397118fd2088b00d5040de1e59b8783d93290
parent 372954 3c11faa00c25b90f39f1c2447d6b1faca6dadd56
child 372956 9c60069211b548e688f026268a91c6876fd45105
push id10863
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 23:02:23 +0000
treeherdermozilla-aurora@0931190cd725 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1340393, 915973, 1322703
milestone54.0a1
Bug 1340393 - Remove unnecessary -FS option. r=glandium Although I add -FS option to support VS2013+ by bug 915973, after landing bug 1322703, -FS option is unnecessary now. MozReview-Commit-ID: 4SYmwGXHA9U
js/src/old-configure.in
old-configure.in
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -695,20 +695,16 @@ case "$target" in
           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([,])
         fi
-        dnl VS2013+ requires -FS when parallel building by make -jN.
-        dnl If nothing, compiler sometimes causes C1041 error.
-        CFLAGS="$CFLAGS -FS"
-        CXXFLAGS="$CXXFLAGS -FS"
         dnl VS2013+ supports -Gw for better linker optimizations.
         dnl http://blogs.msdn.com/b/vcblog/archive/2013/09/11/introducing-gw-compiler-switch.aspx
         dnl Disabled on ASan because it causes false-positive ODR violations.
         if test -z "$MOZ_ASAN"; then
             CFLAGS="$CFLAGS -Gw"
             CXXFLAGS="$CXXFLAGS -Gw"
         fi
         # khuey says we can safely ignore MSVC warning C4251
--- a/old-configure.in
+++ b/old-configure.in
@@ -981,20 +981,16 @@ case "$target" in
             dnl and doesn't have a separate arch for SSSE3
             SSSE3_FLAGS="-arch:SSE2"
         fi
         dnl clang-cl requires appropriate flags to enable SSSE3 support
         dnl on all architectures.
         if test -n "$CLANG_CL"; then
             SSSE3_FLAGS="-mssse3"
         fi
-        dnl VS2013+ requires -FS when parallel building by make -jN.
-        dnl If nothing, compiler sometimes causes C1041 error.
-        CFLAGS="$CFLAGS -FS"
-        CXXFLAGS="$CXXFLAGS -FS"
         dnl VS2013+ supports -Gw for better linker optimizations.
         dnl http://blogs.msdn.com/b/vcblog/archive/2013/09/11/introducing-gw-compiler-switch.aspx
         dnl Disabled on ASan because it causes false-positive ODR violations.
         if test -z "$MOZ_ASAN"; then
             CFLAGS="$CFLAGS -Gw"
             CXXFLAGS="$CXXFLAGS -Gw"
         fi
         # khuey says we can safely ignore MSVC warning C4251