Backout part of the follow-up to bug 785102 for causing unexpected segfaults on the Linux 64 bit builds. r=bustage-fix
authorMark Banner <bugzilla@standard8.plus.com>
Fri, 24 Aug 2012 16:23:14 +0100
changeset 103331 85634e93f08dc6d63d5963c48bd03dcc267ad324
parent 103330 f37e93ab69c00669bace52f1f681b5596d5ae964
child 103332 6a6f205e757045642d6a9a020db56fcf942275fd
push id13945
push userryanvm@gmail.com
push dateFri, 24 Aug 2012 20:18:14 +0000
treeherdermozilla-inbound@b3c861bd1e2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs785102
milestone17.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backout part of the follow-up to bug 785102 for causing unexpected segfaults on the Linux 64 bit builds. r=bustage-fix
toolkit/mozapps/installer/packager.mk
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -467,17 +467,17 @@ endif
 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
 # 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)
+RUN_FROM_PWD = "$$PWD/run-mozilla.sh"
 endif
 endif
 
 # Silence the unzip step so we don't print any binary data from the comment field.
 GENERATE_CACHE = \
   $(RUN_FROM_PWD) $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$(PRECOMPILE_GRE)" -a "$$PWD" -f $(call core_abspath,$(MOZILLA_DIR)/toolkit/mozapps/installer/precompile_cache.js) -e "populate_startupcache('$(PRECOMPILE_DIR)', '$(OMNIJAR_NAME)', 'startupCache.zip');" && \
   rm -rf jsloader jssubloader && \
   $(UNZIP) -q startupCache.zip && \