Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 398566 - Set MOZ_FIX_LINK_PATHS unconditionally, r=luser a=sayrer

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@237719 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
benjamin%smedbergs.us 2007-10-13 21:13:52 +00:00
parent 2d1a8f793a
commit f95f99a9e7
9 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mozilla/accessible/build/Makefile.in
View File

@ -83,7 +83,6 @@ EXTRA_DSO_LIBS = \
$(NULL) $(NULL)
EXTRA_DSO_LDOPTS = \ EXTRA_DSO_LDOPTS = \
$(MOZ_FIX_LINK_PATHS) \
$(LIBS_DIR) \ $(LIBS_DIR) \
$(EXTRA_DSO_LIBS) \ $(EXTRA_DSO_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \ $(MOZ_UNICHARUTIL_LIBS) \

2
mozilla/config/config.mk
View File

@ -531,7 +531,7 @@ endif
CFLAGS = $(OS_CFLAGS) CFLAGS = $(OS_CFLAGS)
CXXFLAGS = $(OS_CXXFLAGS) CXXFLAGS = $(OS_CXXFLAGS)
LDFLAGS = $(OS_LDFLAGS) LDFLAGS = $(OS_LDFLAGS) $(MOZ_FIX_LINK_PATHS)
# Allow each module to override the *default* optimization settings # Allow each module to override the *default* optimization settings
# by setting MODULE_OPTIMIZE_FLAGS if the developer has not given # by setting MODULE_OPTIMIZE_FLAGS if the developer has not given

2
mozilla/configure.in
View File

@ -889,7 +889,7 @@ MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/modules/libimg/png)'
MOZ_JS_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs' MOZ_JS_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core' DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core'
MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin' MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin'
XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin $(MOZ_FIX_LINK_PATHS) -lxpcom' XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom'
LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul' LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)' XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
XPCOM_STANDALONE_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX)' XPCOM_STANDALONE_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX)'

1
mozilla/gfx/src/thebes/Makefile.in
View File

@ -139,7 +139,6 @@ LOCAL_INCLUDES = \
$(NULL) $(NULL)
EXTRA_DSO_LDOPTS += \ EXTRA_DSO_LDOPTS += \
$(MOZ_FIX_LINK_PATHS) \
../shared/$(LIB_PREFIX)gfxshared_s.$(LIB_SUFFIX) \ ../shared/$(LIB_PREFIX)gfxshared_s.$(LIB_SUFFIX) \
$(LIBS_DIR) \ $(LIBS_DIR) \
$(EXTRA_DSO_LIBS) \ $(EXTRA_DSO_LIBS) \

1
mozilla/layout/build/Makefile.in
View File

@ -214,7 +214,6 @@ DEFINES += -DENABLE_EDITOR_API_LOG
endif endif
EXTRA_DSO_LDOPTS = \ EXTRA_DSO_LDOPTS = \
$(MOZ_FIX_LINK_PATHS) \
$(LIBS_DIR) \ $(LIBS_DIR) \
$(EXTRA_DSO_LIBS) \ $(EXTRA_DSO_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \ $(MOZ_UNICHARUTIL_LIBS) \

5
mozilla/security/manager/ssl/src/Makefile.in
View File

@ -139,11 +139,6 @@ DEFINES += -DNSS_ENABLE_ECC
# so that Mozilla's nss.h is used, not glibc's # so that Mozilla's nss.h is used, not glibc's
LOCAL_INCLUDES += $(NSS_CFLAGS) LOCAL_INCLUDES += $(NSS_CFLAGS)
ifeq ($(OS_ARCH),Darwin)
EXTRA_DSO_LDOPTS += \
-Wl,-executable_path -Wl,../../../../dist/bin
endif
EXTRA_DSO_LDOPTS += \ EXTRA_DSO_LDOPTS += \
$(MOZ_UNICHARUTIL_LIBS) \ $(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \ $(MOZ_COMPONENT_LIBS) \

1
mozilla/toolkit/library/libxul-rules.mk
View File

@ -37,7 +37,6 @@
# ***** END LICENSE BLOCK ***** # ***** END LICENSE BLOCK *****
EXTRA_DSO_LDOPTS += \ EXTRA_DSO_LDOPTS += \
$(MOZ_FIX_LINK_PATHS) \
$(LIBS_DIR) \ $(LIBS_DIR) \
$(JPEG_LIBS) \ $(JPEG_LIBS) \
$(PNG_LIBS) \ $(PNG_LIBS) \

1
mozilla/widget/src/cocoa/Makefile.in
View File

@ -130,7 +130,6 @@ EXTRA_DSO_LDOPTS += \
$(call EXPAND_LIBNAME_PATH,gkgfx,$(DEPTH)/gfx/src) \ $(call EXPAND_LIBNAME_PATH,gkgfx,$(DEPTH)/gfx/src) \
$(MOZ_COMPONENT_LIBS) \ $(MOZ_COMPONENT_LIBS) \
-lthebes \ -lthebes \
$(MOZ_FIX_LINK_PATHS) \
$(LCMS_LIBS) \ $(LCMS_LIBS) \
$(NULL) $(NULL)

2
mozilla/xpcom/stub/Makefile.in
View File

@ -80,7 +80,7 @@ FORCE_USE_PIC = 1
FORCE_SHARED_LIB = 1 FORCE_SHARED_LIB = 1
EXTRA_DSO_LDOPTS = $(LIBS_DIR) $(MOZ_FIX_LINK_PATHS) EXTRA_DSO_LDOPTS = $(LIBS_DIR)
DEPENDENT_LIBS_LIST += \ DEPENDENT_LIBS_LIST += \
$(LIB_PREFIX)nspr4$(DLL_SUFFIX) \ $(LIB_PREFIX)nspr4$(DLL_SUFFIX) \