mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-22 22:00:49 +00:00
Make sure we only run which_lib if needed; fixed building Win DLL flags
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12252 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
945b83eb3c
commit
20a00712b3
1 changed files with 8 additions and 8 deletions
16
objc.make
16
objc.make
|
@ -74,16 +74,16 @@ else
|
|||
# directory in GNUSTEP_LOCAL_ROOT.
|
||||
OBJC_PROGRAM_INSTALLATION_DIR = $(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_DIR)
|
||||
|
||||
ALL_OBJC_LIBS = $(ADDITIONAL_OBJC_LIBS) $(AUXILIARY_OBJC_LIBS) $(OBJC_LIBS) \
|
||||
$(TARGET_SYSTEM_LIBS)
|
||||
|
||||
ALL_OBJC_LIBS := \
|
||||
$(shell $(WHICH_LIB_SCRIPT) $(LIB_DIRS_NO_SYSTEM) $(ALL_OBJC_LIBS) \
|
||||
debug=$(debug) profile=$(profile) shared=$(shared) \
|
||||
libext=$(LIBEXT) shared_libext=$(SHARED_LIBEXT))
|
||||
ALL_OBJC_LIBS = \
|
||||
$(shell $(WHICH_LIB_SCRIPT) \
|
||||
$(LIB_DIRS_NO_SYSTEM) \
|
||||
$(ADDITIONAL_OBJC_LIBS) $(AUXILIARY_OBJC_LIBS) $(OBJC_LIBS) \
|
||||
$(TARGET_SYSTEM_LIBS) \
|
||||
debug=$(debug) profile=$(profile) shared=$(shared) \
|
||||
libext=$(LIBEXT) shared_libext=$(SHARED_LIBEXT))
|
||||
|
||||
ifeq ($(WITH_DLL),yes)
|
||||
TTMP_LIBS := $(ALL_TOOL_LIBS)
|
||||
TTMP_LIBS := $(ALL_OBJC_LIBS)
|
||||
TTMP_LIBS := $(filter -l%, $(TTMP_LIBS))
|
||||
# filter all non-static libs (static libs are those ending in _ds, _s, _ps..)
|
||||
TTMP_LIBS := $(filter-out -l%_ds, $(TTMP_LIBS))
|
||||
|
|
Loading…
Reference in a new issue