зеркало из https://github.com/mozilla/pjs.git
Bug 542033. Use the right MOZ_FIX_LINK_PATHS when darwin is the target. r=ted
This commit is contained in:
Родитель
298dd19aeb
Коммит
b0410119e3
|
@ -1730,7 +1730,6 @@ 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}"
|
||||
MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
|
||||
;;
|
||||
|
||||
*-linux*|*-kfreebsd*-gnu)
|
||||
|
@ -1916,6 +1915,7 @@ case "$target" in
|
|||
|
||||
LDFLAGS=$_SAVE_LDFLAGS
|
||||
fi
|
||||
MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
|
||||
;;
|
||||
|
||||
*-freebsd*)
|
||||
|
|
|
@ -1508,7 +1508,6 @@ 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}"
|
||||
MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
|
||||
LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL -lobjc'
|
||||
;;
|
||||
|
||||
|
@ -1677,6 +1676,7 @@ case "$target" in
|
|||
|
||||
LDFLAGS=$_SAVE_LDFLAGS
|
||||
fi
|
||||
MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
|
||||
;;
|
||||
|
||||
*-freebsd*)
|
||||
|
|
Загрузка…
Ссылка в новой задаче