wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Follow-up to bug 785102 - Set the library path rather than using run-mozilla.sh to fix builds for apps that don't ship run-mozilla.sh on Mac. Also define the command for when LIBXUL_SDK is set. r=glandium over irc

Browse Source
This commit is contained in:
Mark Banner 2012-08-24 14:22:03 +01:00
parent 50a201dc1e
commit cb0d6aa0e3
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
toolkit/mozapps/installer/packager.mk
View File

@ -464,15 +464,16 @@ PRECOMPILE_RESOURCE=gre
PRECOMPILE_GRE=$$PWD
endif
ifndef LIBXUL_SDK
ifneq (,$(filter WINNT OS2,$(OS_ARCH)))
# FIXME: not tested on OS/2. Is it using the correct libxul?
RUN_FROM_PWD = $(_ABS_RUN_TEST_PROGRAM)
else
RUN_FROM_PWD = "$$PWD/run-mozilla.sh"
# For non-Windows, just set the library path so we load the libs from the right place.
ifdef ($(OS_ARCH),Darwin)
RUN_FROM_PWD = DYLD_LIBRARY_PATH=$(PRECOMPILE_GRE)
else
RUN_FROM_PWD = LD_LIBRARY_PATH=$(PRECOMPILE_GRE)
endif
endif
# Silence the unzip step so we don't print any binary data from the comment field.