Commit b1530418 authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 1747160 - Don't add TK_CFLAGS to CFLAGS/CXXFLAGS and don't add frameworks... 

Bug 1747160 - Don't add TK_CFLAGS to CFLAGS/CXXFLAGS and don't add frameworks to LDFLAGS. r=firefox-build-system-reviewers,mhentges

TK_CFLAGS is empty anyway, and the frameworks are redundant with TK_LIBS.

Differential Revision: https://phabricator.services.mozilla.com/D134457
parent 9877647a

browser/app/moz.build

+3 −0
Original line number Diff line number Diff line
@@ -103,6 +103,9 @@ if CONFIG["MOZ_SANDBOX"] and CONFIG["OS_ARCH"] == "Darwin": 
    USE_LIBS += [

        "mozsandbox",

    ]

    OS_LIBS += [

        "-framework CoreFoundation",

    ]



if CONFIG["MOZ_SANDBOX"] and CONFIG["OS_ARCH"] == "WINNT":

    # For sandbox includes and the include dependencies those have

modules/libmar/tool/moz.build

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ if CONFIG["MOZ_BUILD_APP"] != "tools/update-packaging": 
        ]

    elif CONFIG["OS_ARCH"] == "Darwin":

        OS_LIBS += [

            "-framework CoreFoundation",

            "-framework Security",

        ]

old-configure.in

+0 −9
Original line number Diff line number Diff line
@@ -1262,21 +1262,15 @@ dnl ======================================================== 
case "$MOZ_WIDGET_TOOLKIT" in



cocoa)

    LDFLAGS="$LDFLAGS -framework Cocoa"

    # Use -Wl as a trick to avoid -framework and framework names from

    # being separated by AC_SUBST_LIST.

    TK_LIBS='-Wl,-framework,Foundation -Wl,-framework,CoreFoundation -Wl,-framework,CoreLocation -Wl,-framework,QuartzCore -Wl,-framework,Carbon -Wl,-framework,CoreAudio -Wl,-framework,CoreVideo -Wl,-framework,AudioToolbox -Wl,-framework,AudioUnit -Wl,-framework,AddressBook -Wl,-framework,OpenGL -Wl,-framework,Security -Wl,-framework,ServiceManagement -Wl,-framework,CoreServices -Wl,-framework,ApplicationServices -Wl,-framework,AppKit -Wl,-framework,CoreMIDI'

    TK_CFLAGS=""

    CFLAGS="$CFLAGS $TK_CFLAGS"

    CXXFLAGS="$CXXFLAGS $TK_CFLAGS"

    ;;



uikit)

    LDFLAGS="$LDFLAGS -framework UIKit"

    TK_CFLAGS=""

    TK_LIBS='-Wl,-framework,Foundation -Wl,-framework,CoreFoundation -Wl,-framework,CoreGraphics -Wl,-framework,CoreText -Wl,-framework,AVFoundation -Wl,-framework,AudioToolbox -Wl,-framework,CoreMedia -Wl,-framework,CoreVideo -Wl,-framework,OpenGLES -Wl,-framework,QuartzCore'

    CFLAGS="$CFLAGS $TK_CFLAGS"

    CXXFLAGS="$CXXFLAGS $TK_CFLAGS"

    ;;



esac
@@ -1369,9 +1363,6 @@ dnl = Apple platform decoder support 
dnl ========================================================

if test "$COMPILE_ENVIRONMENT"; then

if test -n "$MOZ_APPLEMEDIA"; then

  # hack in frameworks for fmp4 - see bug 1029974

  # We load VideoToolbox and CoreMedia dynamically, so they don't appear here.

  LDFLAGS="$LDFLAGS -framework AudioToolbox"

  dnl Verify CoreMedia is available.

  AC_CHECK_HEADERS([CoreMedia/CoreMedia.h VideoToolbox/VideoToolbox.h], [],

    [AC_MSG_ERROR([MacOS X 10.9 SDK or later is required])])

security/manager/ssl/osclientcerts/dynamic-library/moz.build

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ if CONFIG["OS_ARCH"] == "WINNT": 


if CONFIG["OS_ARCH"] == "Darwin":

    OS_LIBS += [

        "-framework CoreFoundation",

        "-framework Security",

    ]