Backed out changeset 67c398c134df (Bug 1340395 since causing bug 1322703 was backed out). rs=backout a=jorgk
authorJorg K <jorgk@jorgk.com>
Thu, 02 Mar 2017 08:41:00 +0100
changeset 21246 c26182d4b4d9134ad0448178bf98b10d76654795
parent 21245 998987cc390842f7473f0f12a193a84782b73377
child 21247 84e007d226a212a9e79d93fb644aa6a7e57d60a7
push id12905
push usermozilla@jorgk.com
push dateThu, 02 Mar 2017 07:43:05 +0000
treeherdercomm-central@c26182d4b4d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout, jorgk
bugs1340395, 1322703
backs out67c398c134dfc7b092b73b8abf2c35f40eb37ef4
Backed out changeset 67c398c134df (Bug 1340395 since causing bug 1322703 was backed out). rs=backout a=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,23 +14,16 @@ 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,23 +18,16 @@ 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,23 +9,16 @@ 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,23 +18,16 @@ 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,21 +13,13 @@ 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,20 +14,13 @@ 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,20 +16,13 @@ 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