зеркало из https://github.com/mozilla/pjs.git
Use LDFLAGS when creating shared libraries. It may contain the paths to essential libraries.
This commit is contained in:
Родитель
c01ce98485
Коммит
61f85b0c73
|
@ -718,13 +718,13 @@ ifdef SHARED_LIBRARY_LIBS
|
|||
ifeq ($(TARGET_MD_ARCH), win32)
|
||||
$(MKSHLIB) $(OBJS) $(LOBJS) $(SUB_LOBJS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS)
|
||||
else
|
||||
$(MKSHLIB) -o $@ $(OBJS) $(LOBJS) $(SUB_LOBJS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS)
|
||||
$(MKSHLIB) -o $@ $(OBJS) $(LOBJS) $(SUB_LOBJS) $(LDFLAGS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS)
|
||||
endif # TARGET_MD_ARCH
|
||||
else
|
||||
$(MKSHLIB) -o $@ $(OBJS) $(LOBJS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS)
|
||||
$(MKSHLIB) -o $@ $(OBJS) $(LOBJS) $(LDFLAGS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS)
|
||||
endif
|
||||
else
|
||||
$(MKSHLIB) -o $@ $(OBJS) $(LOBJS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS)
|
||||
$(MKSHLIB) -o $@ $(OBJS) $(LOBJS) $(LDFLAGS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS)
|
||||
endif
|
||||
@rm -f foodummyfilefoo $(SUB_LOBJS)
|
||||
else
|
||||
|
|
|
@ -204,7 +204,7 @@ else
|
|||
NSPR_STATIC_PATH = $(DIST)/lib
|
||||
endif
|
||||
|
||||
LDFLAGS = $(pathsubst -l%,$(NSPR_STATIC_PATH)/%.a,$(NSPR_LIBS))
|
||||
LDFLAGS += $(pathsubst -l%,$(NSPR_STATIC_PATH)/%.a,$(NSPR_LIBS))
|
||||
|
||||
ifneq ($(OS_ARCH),BeOS)
|
||||
LDFLAGS += -lm
|
||||
|
|
Загрузка…
Ссылка в новой задаче