diff options
Diffstat (limited to 'Makeconfig')
| -rw-r--r-- | Makeconfig | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Makeconfig b/Makeconfig index cd0e4799a1..10bca6018a 100644 --- a/Makeconfig +++ b/Makeconfig @@ -347,7 +347,8 @@ else default-rpath = $(libdir) endif # This is how to find at build-time things that will be installed there. -rpath-link = $(common-objdir):$(elfobjdir):$(nssobjdir) +rpath-link = $(common-objdir):$(mathobjdir):$(elfobjdir):$(nssobjdir) +mathobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)math) elfobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)elf) nssobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)nss) else @@ -356,7 +357,13 @@ endif endif ifndef link-extra-libs ifeq (yes,$(build-shared)) +ifneq ($(common-objpfx),$(objpfx)) +link-extra-libs = $(foreach lib,$(LDLIBS-$(@F)),\ + $(wildcard $(common-objpfx)$(lib).so$($(notdir $(lib)).so-version) \ + $(objpfx)$(lib).so$($(notdir $(lib)).so-version))) +else link-extra-libs = $(foreach lib,$(LDLIBS-$(@F)),$(common-objpfx)$(lib).so$($(notdir $(lib)).so-version)) +endif else link-extra-libs = $(foreach lib,$(LDLIBS-$(@F)),$(common-objpfx)$(lib).a) endif |