summaryrefslogtreecommitdiff
path: root/gcc/melt-module.mk
diff options
context:
space:
mode:
authorbstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4>2012-01-21 21:26:27 +0000
committerbstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4>2012-01-21 21:26:27 +0000
commit624b7f95dcf8ec851fa421dd4ece7862f7c51b85 (patch)
tree434e08e7d240a10b96b474abe1c1a2c62fa5d7ac /gcc/melt-module.mk
parentce3e87714f339fe6a10c78c74ce564defeaafb9f (diff)
downloadgcc-624b7f95dcf8ec851fa421dd4ece7862f7c51b85.tar.gz
2012-01-21 Basile Starynkevitch <basile@starynkevitch.net>
* melt-module.mk: Share the *+meltdesc.pic.o for all flavors. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@183375 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/melt-module.mk')
-rw-r--r--gcc/melt-module.mk24
1 files changed, 14 insertions, 10 deletions
diff --git a/gcc/melt-module.mk b/gcc/melt-module.mk
index 03f21b021f2..b810bd529d0 100644
--- a/gcc/melt-module.mk
+++ b/gcc/melt-module.mk
@@ -147,7 +147,8 @@ $(GCCMELT_MODULE_WORKSPACE)/$(basename $(notdir $(GCCMELT_DESC))).$(GCCMELT_CUMU
$(GCCMELT_MODULE_WORKSPACE)/$(GCCMELT_BASE).$(GCCMELT_CUMULATED_MD5).optimized.so: \
$(GCCMELT_MODULE_WORKSPACE)/$(GCCMELT_PRIMARY_OBJ).optimized.pic.o \
- $(addsuffix .optimized.pic.o, $(GCCMELT_MODULE_WORKSPACE)/$(GCCMELT_PRIMARY_OBJ) $(patsubst %,$(GCCMELT_MODULE_WORKSPACE)/%,$(GCCMELT_SECONDARIES_OBJ)))
+ $(addsuffix .optimized.pic.o, $(GCCMELT_MODULE_WORKSPACE)/$(GCCMELT_PRIMARY_OBJ) $(patsubst %,$(GCCMELT_MODULE_WORKSPACE)/%,$(GCCMELT_SECONDARIES_OBJ))) \
+ $(GCCMELT_MODULE_WORKSPACE)/$(basename $(notdir $(GCCMELT_DESC))).$(GCCMELT_CUMULATED_MD5).pic.o
[ -d $(GCCMELT_MODULE_WORKSPACE) ] || mkdir -p $(GCCMELT_MODULE_WORKSPACE)
$(MAKE) -f $(filter %melt-module.mk, $(MAKEFILE_LIST)) $^ \
GCCMELT_MODULE_SOURCEBASE=$(GCCMELT_MODULE_SOURCEBASE) \
@@ -155,49 +156,52 @@ $(GCCMELT_MODULE_WORKSPACE)/$(GCCMELT_BASE).$(GCCMELT_CUMULATED_MD5).optimized.s
GCCMELT_MODULE_WORKSPACE=$(GCCMELT_MODULE_WORKSPACE) \
GCCMELT_MODULE_FLAVOR=$(GCCMELT_MODULE_FLAVOR) \
GCCMELT_CUMULATED_MD5=$(GCCMELT_CUMULATED_MD5)
- $(GCCMELT_CC) $(GCCMELT_OPTIMIZED_FLAGS) $(GCCMELT_CFLAGS) -fPIC -shared -o $@ $(GCCMELT_DESC) $^
+ $(GCCMELT_CC) $(GCCMELT_OPTIMIZED_FLAGS) $(GCCMELT_CFLAGS) -fPIC -shared -o $@ $^
$(GCCMELT_MODULE_WORKSPACE)/$(GCCMELT_BASE).$(GCCMELT_CUMULATED_MD5).dynamic.so: \
$(GCCMELT_MODULE_WORKSPACE)/$(GCCMELT_PRIMARY_OBJ).dynamic.pic.o \
- $(addsuffix .dynamic.pic.o, $(GCCMELT_MODULE_WORKSPACE)/$(GCCMELT_PRIMARY_OBJ) $(patsubst %,$(GCCMELT_MODULE_WORKSPACE)/%,$(GCCMELT_SECONDARIES_OBJ)))
+ $(addsuffix .dynamic.pic.o, $(GCCMELT_MODULE_WORKSPACE)/$(GCCMELT_PRIMARY_OBJ) $(patsubst %,$(GCCMELT_MODULE_WORKSPACE)/%,$(GCCMELT_SECONDARIES_OBJ))) \
+ $(GCCMELT_MODULE_WORKSPACE)/$(basename $(notdir $(GCCMELT_DESC))).$(GCCMELT_CUMULATED_MD5).pic.o
$(MAKE) -f $(filter %melt-module.mk, $(MAKEFILE_LIST)) $^ \
GCCMELT_MODULE_SOURCEBASE=$(GCCMELT_MODULE_SOURCEBASE) \
GCCMELT_MODULE_BINARYBASE=$(GCCMELT_MODULE_BINARYBASE) \
GCCMELT_MODULE_WORKSPACE=$(GCCMELT_MODULE_WORKSPACE) \
GCCMELT_MODULE_FLAVOR=$(GCCMELT_MODULE_FLAVOR) \
GCCMELT_CUMULATED_MD5=$(GCCMELT_CUMULATED_MD5)
- $(GCCMELT_CC) $(GCCMELT_DYNAMIC_FLAGS) $(GCCMELT_CFLAGS) -fPIC -shared -o $@ $(GCCMELT_DESC) $^
+ $(GCCMELT_CC) $(GCCMELT_DYNAMIC_FLAGS) $(GCCMELT_CFLAGS) -fPIC -shared -o $@ $^
$(GCCMELT_MODULE_WORKSPACE)/$(GCCMELT_BASE).$(GCCMELT_CUMULATED_MD5).quicklybuilt.so: \
$(GCCMELT_MODULE_WORKSPACE)/$(GCCMELT_PRIMARY_OBJ).quicklybuilt.pic.o \
- $(addsuffix .quicklybuilt.pic.o, $(GCCMELT_MODULE_WORKSPACE)/$(GCCMELT_PRIMARY_OBJ) $(patsubst %,$(GCCMELT_MODULE_WORKSPACE)/%,$(GCCMELT_SECONDARIES_OBJ)))
+ $(addsuffix .quicklybuilt.pic.o, $(GCCMELT_MODULE_WORKSPACE)/$(GCCMELT_PRIMARY_OBJ) $(patsubst %,$(GCCMELT_MODULE_WORKSPACE)/%,$(GCCMELT_SECONDARIES_OBJ))) \
+ $(GCCMELT_MODULE_WORKSPACE)/$(basename $(notdir $(GCCMELT_DESC))).$(GCCMELT_CUMULATED_MD5).pic.o
$(MAKE) -f $(filter %melt-module.mk, $(MAKEFILE_LIST)) $^ \
GCCMELT_MODULE_SOURCEBASE=$(GCCMELT_MODULE_SOURCEBASE) \
GCCMELT_MODULE_BINARYBASE=$(GCCMELT_MODULE_BINARYBASE) \
GCCMELT_MODULE_WORKSPACE=$(GCCMELT_MODULE_WORKSPACE) \
GCCMELT_MODULE_FLAVOR=$(GCCMELT_MODULE_FLAVOR) \
GCCMELT_CUMULATED_MD5=$(GCCMELT_CUMULATED_MD5)
- $(GCCMELT_CC) $(GCCMELT_QUICKLYBUILT_FLAGS) $(GCCMELT_CFLAGS) -fPIC -shared -o $@ $(GCCMELT_DESC) $^
+ $(GCCMELT_CC) $(GCCMELT_QUICKLYBUILT_FLAGS) $(GCCMELT_CFLAGS) -fPIC -shared -o $@ $^
$(GCCMELT_MODULE_WORKSPACE)/$(GCCMELT_BASE).$(GCCMELT_CUMULATED_MD5).debugnoline.so: \
$(GCCMELT_MODULE_WORKSPACE)/$(GCCMELT_PRIMARY_OBJ).debugnoline.pic.o \
- $(addsuffix .debugnoline.pic.o, $(GCCMELT_MODULE_WORKSPACE)/$(GCCMELT_PRIMARY_OBJ) $(patsubst %,$(GCCMELT_MODULE_WORKSPACE)/%,$(GCCMELT_SECONDARIES_OBJ)))
+ $(addsuffix .debugnoline.pic.o, $(GCCMELT_MODULE_WORKSPACE)/$(GCCMELT_PRIMARY_OBJ) $(patsubst %,$(GCCMELT_MODULE_WORKSPACE)/%,$(GCCMELT_SECONDARIES_OBJ))) \
+ $(GCCMELT_MODULE_WORKSPACE)/$(basename $(notdir $(GCCMELT_DESC))).$(GCCMELT_CUMULATED_MD5).pic.o
$(MAKE) -f $(filter %melt-module.mk, $(MAKEFILE_LIST)) $^ \
GCCMELT_MODULE_SOURCEBASE=$(GCCMELT_MODULE_SOURCEBASE) \
GCCMELT_MODULE_BINARYBASE=$(GCCMELT_MODULE_BINARYBASE) \
GCCMELT_MODULE_WORKSPACE=$(GCCMELT_MODULE_WORKSPACE) \
GCCMELT_MODULE_FLAVOR=$(GCCMELT_MODULE_FLAVOR) \
GCCMELT_CUMULATED_MD5=$(GCCMELT_CUMULATED_MD5)
- $(GCCMELT_CC) $(GCCMELT_DEBUGNOLINE_FLAGS) $(GCCMELT_CFLAGS) -fPIC -shared -o $@ $(GCCMELT_DESC) $^
+ $(GCCMELT_CC) $(GCCMELT_DEBUGNOLINE_FLAGS) $(GCCMELT_CFLAGS) -fPIC -shared -o $@ $^
-melt_module: $(GCCMELT_MODULE_BINARYBASE).$(GCCMELT_MODULE_FLAVOR).so
$(GCCMELT_MODULE_BINARYBASE).$(GCCMELT_MODULE_FLAVOR).so: $(GCCMELT_MODULE_WORKSPACE)/$(GCCMELT_BASE).$(GCCMELT_CUMULATED_MD5).$(GCCMELT_MODULE_FLAVOR).so
echo @+@melt-module inf= $< at= $@
- $(LN_S) -f $(realpath $<) $@
+ $(LN_S) -v -f $(realpath $<) $@
+melt_module: $(GCCMELT_MODULE_BINARYBASE).$(GCCMELT_MODULE_FLAVOR).so
## eof melt-module.mk