Bug 1245422 - Remove the -FR C*FLAGS on Windows builds. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 03 Feb 2016 17:08:22 +0900
changeset 282997 16ade0e51193116952362c268a31beb704ea9fe6
parent 282996 7af06ac5c2802344f4dbab5f495c5d055ec00e94
child 282998 07c8d571d63b939adad6f53993ef570b0e06ecfa
push id29972
push usercbook@mozilla.com
push dateThu, 04 Feb 2016 11:02:19 +0000
treeherdermozilla-central@f53533d9eb77 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1245422
milestone47.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1245422 - Remove the -FR C*FLAGS on Windows builds. r=mshal The flag is used to create .sbr files, which bscmake subsequently uses to create .bsc files. These files and related tools are, aiui, the ancestors of Intellisense. The -FR C*FLAGS are added to the build if MOZ_BROWSE_INFO or MOZ_BSCFILE are set in the recursive make backend. While the former has an AC_SUBST, the latter does not, so in practice, only the former can be set by supported methods, and would need to be set in a mozconfig. At that rate, people who do want those flags can add them in the C*FLAGS on their own. Developers are probably better served by the VisualStudio backend anyways.
config/config.mk
configure.in
js/src/configure.in
--- a/config/config.mk
+++ b/config/config.mk
@@ -184,22 +184,17 @@ else
 ASFLAGS += $(_DEBUG_ASFLAGS)
 endif
 OS_CFLAGS += $(_DEBUG_CFLAGS)
 OS_CXXFLAGS += $(_DEBUG_CFLAGS)
 OS_LDFLAGS += $(_DEBUG_LDFLAGS)
 
 # XXX: What does this? Bug 482434 filed for better explanation.
 ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_)
-ifdef MOZ_DEBUG
-ifneq (,$(MOZ_BROWSE_INFO)$(MOZ_BSCFILE))
-OS_CFLAGS += -FR
-OS_CXXFLAGS += -FR
-endif
-else # ! MOZ_DEBUG
+ifndef MOZ_DEBUG
 
 # MOZ_DEBUG_SYMBOLS generates debug symbols in separate PDB files.
 # Used for generating an optimized build with debugging symbols.
 # Used in the Windows nightlies to generate symbols for crash reporting.
 ifdef MOZ_DEBUG_SYMBOLS
 OS_CXXFLAGS += -UDEBUG -DNDEBUG
 OS_CFLAGS += -UDEBUG -DNDEBUG
 ifdef HAVE_64BIT_BUILD
--- a/configure.in
+++ b/configure.in
@@ -8743,17 +8743,16 @@ dnl policy alert), set MOZ_DATA_REPORTIN
 dnl We need SUBST for build system and DEFINE for xul preprocessor.
 if test -n "$MOZ_TELEMETRY_REPORTING" || test -n "$MOZ_SERVICES_HEALTHREPORT" || test -n "$MOZ_CRASHREPORTER"; then
   MOZ_DATA_REPORTING=1
   AC_DEFINE(MOZ_DATA_REPORTING)
   AC_SUBST(MOZ_DATA_REPORTING)
 fi
 
 dnl win32 options
-AC_SUBST(MOZ_BROWSE_INFO)
 AC_SUBST(WIN32_REDIST_DIR)
 AC_SUBST(MAKENSISU)
 
 dnl Echo the CFLAGS to remove extra whitespace.
 CFLAGS=`echo \
     $_WARNINGS_CFLAGS \
     $CFLAGS`
 
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -3618,19 +3618,16 @@ AC_SUBST(MOZ_POST_PROGRAM_COMMAND)
 AC_SUBST(MOZ_APP_NAME)
 AC_SUBST(MOZ_APP_DISPLAYNAME)
 AC_SUBST(MOZ_APP_VERSION)
 
 AC_SUBST(MOZ_PKG_SPECIAL)
 
 AC_SUBST(MOZILLA_OFFICIAL)
 
-dnl win32 options
-AC_SUBST(MOZ_BROWSE_INFO)
-
 dnl Echo the CFLAGS to remove extra whitespace.
 CFLAGS=`echo \
 	$_WARNINGS_CFLAGS \
 	$CFLAGS`
 
 CXXFLAGS=`echo \
 	$_WARNINGS_CXXFLAGS \
 	$CXXFLAGS`