[tor-commits] [tor-browser/tor-browser-60.0.1esr-8.0-1] Bug 1460647 - Move big-obj out of Developer_OPTIONS so local MinGW builds work. r=mshal, a=jcristau

[gk at torproject.org]

commit e28ee1528479bf56e98f2961c774ebe7caaea765
Author: Tom Ritter <tom at mozilla.com>
Date:   Fri May 4 10:33:25 2018 -0500

    Bug 1460647 - Move big-obj out of Developer_OPTIONS so local MinGW builds work. r=mshal, a=jcristau
    
    MozReview-Commit-ID: KxfoVkO4pu8
    
    --HG--
    extra : source : 66ae522408686963c4752c954b9a4b26bd0cc8f7
---
 build/autoconf/compiler-opts.m4 | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/build/autoconf/compiler-opts.m4 b/build/autoconf/compiler-opts.m4
index b8ff219aa5d2..7c62bf4d54ed 100644
--- a/build/autoconf/compiler-opts.m4
+++ b/build/autoconf/compiler-opts.m4
@@ -123,13 +123,14 @@ if test "$GNU_CC"; then
     if test -z "$DEVELOPER_OPTIONS"; then
         CFLAGS="$CFLAGS -ffunction-sections -fdata-sections"
         CXXFLAGS="$CXXFLAGS -ffunction-sections -fdata-sections"
+    fi
 
-        # For MinGW, we need big-obj otherwise we create too many sections in Unified builds
-        if test "${OS_ARCH}" = "WINNT"; then
-            CFLAGS="$CFLAGS -Wa,-mbig-obj"
-            CXXFLAGS="$CXXFLAGS -Wa,-mbig-obj"
-        fi
+    # For MinGW, we need big-obj otherwise we create too many sections in Unified builds
+    if test "${OS_ARCH}" = "WINNT"; then
+        CFLAGS="$CFLAGS -Wa,-mbig-obj"
+        CXXFLAGS="$CXXFLAGS -Wa,-mbig-obj"
     fi
+
     CFLAGS="$CFLAGS -fno-math-errno"
     CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-math-errno"
 fi