Merge m-c to fx-team

python/mozbuild/mozbuild/frontend/emitter.py

@@ -245,6 +245,7 @@ class TreeMetadataEmitter(LoggingMixin):
             'CFLAGS',
             'CXXFLAGS',
             'LDFLAGS',
+            'WIN32_EXE_LDFLAGS',
         ]
         for v in varlist:
             if v in sandbox and sandbox[v]:

python/mozbuild/mozbuild/frontend/sandbox_symbols.py

@@ -710,6 +710,17 @@ VARIABLES = {
            added to the linker's command line in the same order as they
            appear in the moz.build file.
         """, 'libs'),
+
+    'WIN32_EXE_LDFLAGS': (list, list,
+        """Flags passed to the linker when linking a Windows .exe executable
+           declared in this directory.
+
+           Note that the ordering of flags matter here, these flags will be
+           added to the linker's command line in the same order as they
+           appear in the moz.build file.
+
+           This variable only has an effect on Windows.
+        """, 'libs'),
 }
 
 # The set of functions exposed to the sandbox.

python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build

@@ -45,3 +45,4 @@ USE_STATIC_LIBS = True
 CFLAGS += ['-fno-exceptions', '-w']
 CXXFLAGS += ['-fcxx-exceptions', '-include foo.h']
 LDFLAGS += ['-framework Foo', '-x']
+WIN32_EXE_LDFLAGS += ['-subsystem:console']

python/mozbuild/mozbuild/test/backend/test_recursivemake.py

@@ -351,7 +351,10 @@ class TestRecursiveMakeBackend(BackendTester):
             'LDFLAGS': [
                 'LDFLAGS += -framework Foo',
                 'LDFLAGS += -x',
-            ]
+            ],
+            'WIN32_EXE_LDFLAGS': [
+                'WIN32_EXE_LDFLAGS += -subsystem:console',
+            ],
         }
 
         for var, val in expected.items():

python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build

@@ -51,3 +51,4 @@ USE_STATIC_LIBS = True
 CFLAGS += ['-fno-exceptions', '-w']
 CXXFLAGS += ['-fcxx-exceptions', '-include foo.h']
 LDFLAGS += ['-framework Foo', '-x']
+WIN32_EXE_LDFLAGS += ['-subsystem:console']

python/mozbuild/mozbuild/test/frontend/test_emitter.py

@@ -179,6 +179,7 @@ class TestEmitterBasic(unittest.TestCase):
             CFLAGS=['-fno-exceptions', '-w'],
             CXXFLAGS=['-fcxx-exceptions', '-include foo.h'],
             LDFLAGS=['-framework Foo', '-x'],
+            WIN32_EXE_LDFLAGS=['-subsystem:console'],
         )
 
         variables = objs[0].variables