From e9f4965dfa26ce2c527f75f519cc8e1050e6222f Mon Sep 17 00:00:00 2001 From: Marco Bonardo Date: Wed, 30 Nov 2011 11:12:57 +0100 Subject: [PATCH] Backout 281583d67072 (bug 702179) for Win64 opt build failure --- configure.in | 2 +- js/src/Makefile.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index d71772b0bf68..070ab2865a6a 100644 --- a/configure.in +++ b/configure.in @@ -1335,7 +1335,7 @@ MOZ_BZ2_LIBS='$(call EXPAND_LIBNAME_PATH,bz2,$(DEPTH)/modules/libbz2/src)' MOZ_PNG_CFLAGS= MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/media/libpng)' -MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(DEPTH)/js/src)' +MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(LIBXUL_DIST)/lib)' MOZ_JS_SHARED_LIBS='$(call EXPAND_LIBNAME_PATH,mozjs,$(LIBXUL_DIST)/lib)' DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core -lmozalloc' MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib' diff --git a/js/src/Makefile.in b/js/src/Makefile.in index 4ea702e83047..c2329b3baf60 100644 --- a/js/src/Makefile.in +++ b/js/src/Makefile.in @@ -93,6 +93,7 @@ ifdef JS_SHARED_LIBRARY FORCE_SHARED_LIB = 1 endif FORCE_STATIC_LIB = 1 +DIST_INSTALL = 1 VPATH = \ $(srcdir) \