commit 6ddaacd Author: Ginn Chen Date: Wed Nov 30 07:23:46 2011 +0800 Bug 702179 dtrace probes are not installed on Solaris with static js lib r=glandium --- configure.in | 2 +- js/src/Makefile.in | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git configure.in configure.in index 66549c1..75b848d 100644 --- configure.in +++ configure.in @@ -966,7 +966,7 @@ MOZ_BZ2_LIBS='$(call EXPAND_LIBNAME_PATH,bz2,$(DEPTH)/modules/libbz2/src)' MOZ_PNG_CFLAGS="-I$_objdir/dist/include" # needed for freetype compilation MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/media/libpng)' -MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(LIBXUL_DIST)/lib)' +MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(DEPTH)/js/src)' MOZ_JS_SHARED_LIBS='$(call EXPAND_LIBNAME_PATH,mozjs,$(LIBXUL_DIST)/lib)' MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib' XPCOM_FROZEN_LDOPTS='$(call EXPAND_LIBNAME_PATH,xul mozalloc,$(LIBXUL_DIST)/bin)' diff --git js/src/Makefile.in js/src/Makefile.in index e28160a..28ca5e8 100644 --- js/src/Makefile.in +++ js/src/Makefile.in @@ -18,8 +18,6 @@ run_for_side_effects := $(shell echo 'MAKE: $(MAKE)') STATIC_LIBRARY_NAME = js_static LIBS = $(NSPR_LIBS) -DIST_INSTALL = 1 - ifdef JS_STANDALONE SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,mfbt,$(DEPTH)/mfbt) ifndef MOZ_NATIVE_ZLIB