Bug 981428 - Move OSX -framework flags to moz.build; r=mshal

content/media/apple/Makefile.in

@@ -1,7 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-LDFLAGS += \
-    -framework AudioToolbox \
-    $(NULL)

content/media/apple/moz.build

@@ -17,3 +17,5 @@ UNIFIED_SOURCES += [
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'gklayout'
+
+LDFLAGS += ['-framework AudioToolbox']

dom/plugins/ipc/interpose/Makefile.in

@@ -3,8 +3,3 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIST_INSTALL     = 1
-
-
-EXTRA_DSO_LDOPTS += \
-  -framework Carbon \
-  $(NULL)

dom/plugins/ipc/interpose/moz.build

@@ -13,3 +13,5 @@ UNIFIED_SOURCES += [
 ]
 
 FORCE_SHARED_LIB = True
+
+EXTRA_DSO_LDOPTS += ['-framework Carbon']

dom/plugins/test/testplugin/testplugin.mk

@@ -37,12 +37,6 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
-ifndef __LP64__
-ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-EXTRA_DSO_LDOPTS += -framework Carbon
-endif
-endif
-
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 CXXFLAGS        += $(MOZ_GTK2_CFLAGS)
 CFLAGS          += $(MOZ_GTK2_CFLAGS)

dom/plugins/test/testplugin/testplugin.mozbuild

@@ -49,3 +49,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     RCFILE  = 'nptest.rc'
     RESFILE = 'nptest.res'
     DEFFILE = SRCDIR + '/nptest.def'
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa' and '64' in CONFIG['OS_TEST']:
+    EXTRA_DSO_LDOPTS += ['-framework Carbon']

media/webrtc/signaling/test/Makefile.in

@@ -91,17 +91,6 @@ endif
 
 ifeq ($(OS_TARGET),Darwin)
 LIBS += \
-  -framework AudioToolbox \
-  -framework AudioUnit \
-  -framework Carbon \
-  -framework CoreAudio \
-  -framework OpenGL \
-  -framework QTKit \
-  -framework QuartzCore \
-  -framework Security \
-  -framework SystemConfiguration \
-  -framework IOKit \
-  -F$(MACOS_PRIVATE_FRAMEWORKS_DIR) -framework CoreUI \
   $(TK_LIBS) \
   $(NULL)
 endif

media/webrtc/signaling/test/moz.build

@@ -69,6 +69,20 @@ if CONFIG['OS_TARGET'] == 'Darwin':
     LOCAL_INCLUDES += [
         '/media/mtransport/third_party/nrappkit/src/port/darwin/include',
     ]
+    LDFLAGS += [
+        '-framework AudioToolbox',
+        '-framework AudioUnit',
+        '-framework Carbon',
+        '-framework CoreAudio',
+        '-framework OpenGL',
+        '-framework QTKit',
+        '-framework QuartzCore',
+        '-framework Security',
+        '-framework SystemConfiguration',
+        '-framework IOKit',
+        '-F%s' % CONFIG['MACOS_PRIVATE_FRAMEWORKS_DIR'],
+        '-framework CoreUI',
+    ]
 
 if CONFIG['OS_TARGET'] in ('DragonFly', 'FreeBSD', 'NetBSD', 'OpenBSD'):
     LOCAL_INCLUDES += [

python/mozbuild/mozbuild/frontend/emitter.py

@@ -222,6 +222,7 @@ class TreeMetadataEmitter(LoggingMixin):
             'EXTRA_ASSEMBLER_FLAGS',
             'EXTRA_COMPILE_FLAGS',
             'EXTRA_COMPONENTS',
+            'EXTRA_DSO_LDOPTS',
             'EXTRA_JS_MODULES',
             'EXTRA_PP_COMPONENTS',
             'EXTRA_PP_JS_MODULES',

python/mozbuild/mozbuild/frontend/sandbox_symbols.py

@@ -740,6 +740,14 @@ VARIABLES = {
            appear in the moz.build file.
         """, 'libs'),
 
+    'EXTRA_DSO_LDOPTS': (list, list,
+        """Flags passed to the linker when linking a shared library.
+
+           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.
+        """, 'libs'),
+
     'WIN32_EXE_LDFLAGS': (list, list,
         """Flags passed to the linker when linking a Windows .exe executable
            declared in this directory.

toolkit/crashreporter/client/Makefile.in

@@ -20,7 +20,6 @@ MOZ_WINCONSOLE = 0
 endif
 
 ifeq ($(OS_ARCH),Darwin)
-OS_LIBS += -framework Cocoa
 LIBS += \
   $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/$(LIB_PREFIX)breakpad_common_s.$(LIB_SUFFIX) \
   $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/mac/$(LIB_PREFIX)breakpad_mac_common_s.$(LIB_SUFFIX) \

toolkit/crashreporter/client/moz.build

@@ -30,6 +30,7 @@ elif CONFIG['OS_ARCH'] == 'Darwin':
     LOCAL_INCLUDES += [
         '../google-breakpad/src/common/mac',
     ]
+    LDFLAGS += ['-framework Cocoa']
 elif CONFIG['OS_ARCH'] == 'SunOS':
     SOURCES += [
         'crashreporter_linux.cpp',

toolkit/library/Makefile.in

@@ -53,7 +53,7 @@ COMPONENT_LIBS += $(MOZ_APP_COMPONENT_LIBS)
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-OS_LIBS += -framework OpenGL -lcups
+OS_LIBS += -lcups
 endif
 
 EXTRA_DSO_LDOPTS += \
@@ -171,10 +171,6 @@ EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB)
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 CXXFLAGS += $(TK_CFLAGS)
 OS_LIBS += \
-  -framework SystemConfiguration \
-  -framework QTKit \
-  -framework IOKit \
-  -F$(MACOS_PRIVATE_FRAMEWORKS_DIR) -framework CoreUI \
   $(TK_LIBS) \
   $(NULL)
 endif

toolkit/library/moz.build

@@ -90,3 +90,13 @@ if CONFIG['ACCESSIBILITY']:
 
 if CONFIG['MOZ_WEBRTC']:
     DELAYLOAD_DLLS += ['msdmo.dll']
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    LDFLAGS += [
+        '-framework OpenGL',
+        '-framework SystemConfiguration',
+        '-framework QTKit',
+        '-framework IOKit',
+        '-F%s' % CONFIG['MACOS_PRIVATE_FRAMEWORKS_DIR'],
+        '-framework CoreUI',
+    ]

toolkit/mozapps/update/updater/Makefile.in

@@ -28,10 +28,6 @@ OS_CXXFLAGS += $(TK_CFLAGS)
 OS_LIBS += $(TK_LIBS)
 endif
 
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-OS_LIBS += -framework Cocoa
-endif
-
 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT)) #{
 OS_LIBS += -lcutils -lsysutils
 # clear out all the --wrap flags and remove dependency on mozglue for Gonk

toolkit/mozapps/update/updater/moz.build

@@ -38,6 +38,11 @@ if CONFIG['MOZ_ENABLE_GTK']:
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     have_progressui = 1
+    SOURCES += [
+        'launchchild_osx.mm',
+        'progressui_osx.mm',
+    ]
+    LDFLAGS += ['-framework Cocoa']
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     have_progressui = 1
     SOURCES += [
@@ -51,12 +56,6 @@ if have_progressui == 0:
         'progressui_null.cpp',
     ]
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    SOURCES += [
-        'launchchild_osx.mm',
-        'progressui_osx.mm',
-    ]
-
 DEFINES['NS_NO_XPCOM'] = True
 for var in ('MAR_CHANNEL_ID', 'MOZ_APP_VERSION'):
     DEFINES[var] = '"%s"' % CONFIG[var]