Backed out changeset e7c397118fd2 (
bug 1340393) to fix Windows pgo builds after
bug 1322703 got backed out. r=backout,bustage-fix on a CLOSED TREE
Backed out changeset e7c397118fd2 (
bug 1340393) to fix Windows pgo builds after
bug 1322703 got backed out. r=backout,bustage-fix on a CLOSED TREE
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -695,16 +695,20 @@ 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,16 +981,20 @@ 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