Bug 1340395 - Append -FS to CFLAGS and CXXFLAGS and use generated.pdb for all the linking. r=jorgk
☠☠ backed out by c26182d4b4d9 ☠ ☠
authorEdmund Wong <ewong@pw-wspx.org>
Tue, 28 Feb 2017 12:28:44 +0800
changeset 27705 67c398c134dfc7b092b73b8abf2c35f40eb37ef4
parent 27704 19fdf87ad6387611db4af35bb7fcf4b788044d09
child 27706 a4027b8e95e6c8a850e22e2e142e974fd910c8af
push idunknown
push userunknown
push dateunknown
reviewersjorgk
bugs1340395
Bug 1340395 - Append -FS to CFLAGS and CXXFLAGS and use generated.pdb for all the linking. r=jorgk
mail/config/mozconfigs/win32/debug
mail/config/mozconfigs/win32/nightly
mail/config/mozconfigs/win64/debug
mail/config/mozconfigs/win64/nightly
suite/config/mozconfigs/win32/nightly
suite/config/mozconfigs/win64/debug
suite/config/mozconfigs/win64/nightly
--- a/mail/config/mozconfigs/win32/debug
+++ b/mail/config/mozconfigs/win32/debug
@@ -14,16 +14,23 @@ export MOZ_DEBUG_SYMBOLS=1
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_ADDON_SIGNING=0
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
+# Bug 1340395 requires the following options enabled in order to build
+# due to linking memory issues. This is just a workaround until
+# this is solved permanently (VS2017?)
+CFLAGS="$CFLAGS -FS"
+CXXFLAGS="$CXXFLAGS -FS"
+mk_add_options "export COMPILE_PDB_FLAG=-Fdgenerated.pdb"
+
 . $topsrcdir/build/win32/mozconfig.vs-latest
 
 # Set up mapi includes (must be done after visual studio setup)
 export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
 mk_export_correct_style INCLUDE
 
 # Run client.py
 mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
--- a/mail/config/mozconfigs/win32/nightly
+++ b/mail/config/mozconfigs/win32/nightly
@@ -18,16 +18,23 @@ export MOZILLA_OFFICIAL=1
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_ADDON_SIGNING=0
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
+# Bug 1340395 requires the following options enabled in order to build
+# due to linking memory issues. This is just a workaround until
+# this is solved permanently (VS2017?)
+CFLAGS="$CFLAGS -FS"
+CXXFLAGS="$CXXFLAGS -FS"
+mk_add_options "export COMPILE_PDB_FLAG=-Fdgenerated.pdb"
+
 . $topsrcdir/build/win32/mozconfig.vs-latest
 
 # Set up mapi includes (must be done after visual studio setup)
 export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
 mk_export_correct_style INCLUDE
 
 # Run client.py
 mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
--- a/mail/config/mozconfigs/win64/debug
+++ b/mail/config/mozconfigs/win64/debug
@@ -9,16 +9,23 @@ ac_add_options --enable-debug
 ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
+# Bug 1340395 requires the following options enabled in order to build
+# due to linking memory issues. This is just a workaround until
+# this is solved permanently (VS2017?)
+CFLAGS="$CFLAGS -FS"
+CXXFLAGS="$CXXFLAGS -FS"
+mk_add_options "export COMPILE_PDB_FLAG=-Fdgenerated.pdb"
+
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_ADDON_SIGNING=0
 
 . $topsrcdir/build/win64/mozconfig.vs-latest
 
 # Set up mapi includes (must be done after visual studio setup)
--- a/mail/config/mozconfigs/win64/nightly
+++ b/mail/config/mozconfigs/win64/nightly
@@ -18,16 +18,23 @@ export MOZ_TELEMETRY_REPORTING=1
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_ADDON_SIGNING=0
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
+# Bug 1340395 requires the following options enabled in order to build
+# due to linking memory issues. This is just a workaround until
+# this is solved permanently (VS2017?)
+CFLAGS="$CFLAGS -FS"
+CXXFLAGS="$CXXFLAGS -FS"
+mk_add_options "export COMPILE_PDB_FLAG=-Fdgenerated.pdb"
+
 . $topsrcdir/build/win64/mozconfig.vs-latest
 
 # Set up mapi includes (must be done after visual studio setup)
 export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
 mk_export_correct_style INCLUDE
 
 # Run client.py
 mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
--- a/suite/config/mozconfigs/win32/nightly
+++ b/suite/config/mozconfigs/win32/nightly
@@ -13,13 +13,21 @@ export MOZILLA_OFFICIAL=1
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
+
+# Bug 1340395 requires the following options enabled in order to build
+# due to linking memory issues. This is just a workaround until
+# this is solved permanently (VS2017?)
+CFLAGS="$CFLAGS -FS"
+CXXFLAGS="$CXXFLAGS -FS"
+mk_add_options "export COMPILE_PDB_FLAG=-Fdgenerated.pdb"
+
 . $topsrcdir/build/win32/mozconfig.vs-latest
 
 # Set up mapi includes (must be done after visual studio setup)
 export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
 mk_export_correct_style INCLUDE
--- a/suite/config/mozconfigs/win64/debug
+++ b/suite/config/mozconfigs/win64/debug
@@ -14,13 +14,20 @@ export MOZILLA_OFFICIAL=1
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
+# Bug 1340395 requires the following options enabled in order to build
+# due to linking memory issues. This is just a workaround until
+# this is solved permanently (VS2017?)
+CFLAGS="$CFLAGS -FS"
+CXXFLAGS="$CXXFLAGS -FS"
+mk_add_options "export COMPILE_PDB_FLAG=-Fdgenerated.pdb"
+
 . $topsrcdir/build/win64/mozconfig.vs-latest
 
 # Set up mapi includes (must be done after visual studio setup)
 export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
 mk_export_correct_style INCLUDE
--- a/suite/config/mozconfigs/win64/nightly
+++ b/suite/config/mozconfigs/win64/nightly
@@ -16,13 +16,20 @@ export MOZILLA_OFFICIAL=1
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
+# Bug 1340395 requires the following options enabled in order to build
+# due to linking memory issues. This is just a workaround until
+# this is solved permanently (VS2017?)
+CFLAGS="$CFLAGS -FS"
+CXXFLAGS="$CXXFLAGS -FS"
+mk_add_options "export COMPILE_PDB_FLAG=-Fdgenerated.pdb"
+
 . $topsrcdir/build/win64/mozconfig.vs-latest
 
 # Set up mapi includes (must be done after visual studio setup)
 export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
 mk_export_correct_style INCLUDE