зеркало из https://github.com/mozilla/pjs.git
Bug 543081. Put -lobjc in LDFLAGS, not LIXBUL_LIBS. r=ted
This commit is contained in:
Родитель
ae9815018c
Коммит
bd85a6bde5
|
@ -4901,10 +4901,10 @@ cairo-cocoa)
|
|||
AC_DEFINE(XP_MACOSX)
|
||||
TK_LIBS='-framework Carbon -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework AddressBook'
|
||||
TK_CFLAGS="-DNO_X11"
|
||||
LDFLAGS="$LDFLAGS -framework Cocoa"
|
||||
LDFLAGS="$LDFLAGS -framework Cocoa -lobjc"
|
||||
CFLAGS="$CFLAGS $TK_CFLAGS"
|
||||
CXXFLAGS="$CXXFLAGS $TK_CFLAGS"
|
||||
LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL -lobjc'
|
||||
LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL'
|
||||
MOZ_FS_LAYOUT=bundle
|
||||
MOZ_WEBGL=1
|
||||
;;
|
||||
|
|
|
@ -1508,7 +1508,8 @@ case "$host" in
|
|||
HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"
|
||||
HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
|
||||
HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
|
||||
LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL -lobjc'
|
||||
LDFLAGS="$LDFLAGS -lobjc"
|
||||
LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL'
|
||||
;;
|
||||
|
||||
*-linux*|*-kfreebsd*-gnu)
|
||||
|
|
Загрузка…
Ссылка в новой задаче