mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-01-22 12:04:38 +00:00
Build changes to build mach-o on gcc3: use -install_name option only when linking using -dynamiclib option, since with gcc3 it causes an error when used with -bundle or -execute. r=bryner sr=beard b=153525
This commit is contained in:
parent
bcce436d14
commit
a44ddf4882
@ -448,7 +448,7 @@ ifeq ($(OS_ARCH),Darwin)
|
|||||||
ifdef IS_COMPONENT
|
ifdef IS_COMPONENT
|
||||||
EXTRA_DSO_LDOPTS += -bundle
|
EXTRA_DSO_LDOPTS += -bundle
|
||||||
else
|
else
|
||||||
EXTRA_DSO_LDOPTS += -dynamiclib
|
EXTRA_DSO_LDOPTS += -dynamiclib -install_name @executable_path/\$@
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -777,7 +777,7 @@ case "$target" in
|
|||||||
no_x=yes
|
no_x=yes
|
||||||
MACOSX=1
|
MACOSX=1
|
||||||
_PLATFORM_DEFAULT_TOOLKIT='mac'
|
_PLATFORM_DEFAULT_TOOLKIT='mac'
|
||||||
DSO_LDOPTS="$DSO_LDOPTS -arch ppc -install_name @executable_path/\$@"
|
DSO_LDOPTS="$DSO_LDOPTS -arch ppc"
|
||||||
TK_LIBS='-framework Carbon /System/Library/Frameworks/Carbon.framework/Carbon'
|
TK_LIBS='-framework Carbon /System/Library/Frameworks/Carbon.framework/Carbon'
|
||||||
TK_CFLAGS="-I/Developer/Headers/FlatCarbon -F/System/Library/Frameworks"
|
TK_CFLAGS="-I/Developer/Headers/FlatCarbon -F/System/Library/Frameworks"
|
||||||
CFLAGS="$CFLAGS $TK_CFLAGS"
|
CFLAGS="$CFLAGS $TK_CFLAGS"
|
||||||
|
@ -189,7 +189,7 @@ $(PROGRAM): $(SPLASH_XPM)
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(OS_ARCH),Darwin)
|
ifeq ($(OS_ARCH),Darwin)
|
||||||
EXTRA_DSO_LDOPTS := $(subst -dynamiclib,-execute,$(EXTRA_DSO_LDOPTS))
|
EXTRA_DSO_LDOPTS := $(subst -dynamiclib -install_name @executable_path/\$@,-execute,$(EXTRA_DSO_LDOPTS))
|
||||||
|
|
||||||
ifdef BUILD_STATIC_LIBS
|
ifdef BUILD_STATIC_LIBS
|
||||||
LDFLAGS += -framework QuickTime $(TK_LIBS)
|
LDFLAGS += -framework QuickTime $(TK_LIBS)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user