* [PATCH 1/3] Fix RPM compilation
2011-03-01 11:44 [MELT] Fixing compilation process Alexandre Lissy
2011-03-01 11:44 ` [PATCH 3/3] Regenerating melt-build.mk Alexandre Lissy
2011-03-01 11:44 ` [PATCH 2/3] Fix double '/' in MELT build process Alexandre Lissy
@ 2011-03-01 11:44 ` Alexandre Lissy
2011-03-01 21:31 ` [MELT] Fixing compilation process Basile Starynkevitch
3 siblings, 0 replies; 11+ messages in thread
From: Alexandre Lissy @ 2011-03-01 11:44 UTC (permalink / raw)
To: gcc-patches; +Cc: Alexandre Lissy
The GCC's options -pipe and -Wp,-D_FORTIFY_SOURCE=2 are passed by
default by Mandriva's GCC RPM spec file, and end up in some parts of
MELT CFLAGS. But they should not end up there.
---
gcc/Makefile.in | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 3f1ffa0..f841776 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -5341,6 +5341,7 @@ MELT_RAW_CFLAGS= \
## since the generated routines are no more huge (since the
## initialization code is split in several chunks).. Likewise, avoid
## passing -gtoggle and -g
+## Also remove -pipe and -Wp,-D_FORTIFY_SOURCE=2
MELTHERE_CFLAGS= $(filter-out -g, $(filter-out -gtoggle, $(MELT_RAW_CFLAGS)))
export MELTHERE_CFLAGS
@@ -5430,7 +5431,10 @@ melt_make_source_dir=$(srcdir)/melt
melt_make_module_dir=$(objdir)
melt_make_move=$(SHELL) $(srcdir)/../move-if-change
## Don't use := definitions here!
-melt_make_cc1flags= -I. $(MELTHERE_CFLAGS) -I $(melt_build_include_dir)
+## CC1 forbids -pipe and -Wp,-D_FORTIFY_SOURCE=2
+comma= ,
+MELTHERE_CC1_CFLAGS=$(filter-out -pipe -Wp$(comma)-D_FORTIFY_SOURCE=2, $(MELTHERE_CFLAGS))
+melt_make_cc1flags= -I. $(MELTHERE_CC1_CFLAGS) -I $(melt_build_include_dir)
melt_cflags= -I. $(MELTHERE_CFLAGS) -I $(melt_build_include_dir)
export melt_cflags
## extra cflags are for compiling applicative MELT files, e.g. xtramelt*.c
--
1.7.4.1
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 3/3] Regenerating melt-build.mk
2011-03-01 11:44 [MELT] Fixing compilation process Alexandre Lissy
@ 2011-03-01 11:44 ` Alexandre Lissy
2011-03-01 11:44 ` [PATCH 2/3] Fix double '/' in MELT build process Alexandre Lissy
` (2 subsequent siblings)
3 siblings, 0 replies; 11+ messages in thread
From: Alexandre Lissy @ 2011-03-01 11:44 UTC (permalink / raw)
To: gcc-patches; +Cc: Alexandre Lissy
---
gcc/melt-build.mk | 128 ++++++++++++++++++++++++++--------------------------
1 files changed, 64 insertions(+), 64 deletions(-)
diff --git a/gcc/melt-build.mk b/gcc/melt-build.mk
index f00e43b..e75229e 100644
--- a/gcc/melt-build.mk
+++ b/gcc/melt-build.mk
@@ -164,7 +164,7 @@ melt-stage0-static/warmelt-first-0.so: $(MELT_GENERATED_FIRST_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-static/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-static \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/warmelt-first-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-static/warmelt-first-0
@@ -174,7 +174,7 @@ melt-stage0-dynamic/warmelt-first-0.d.so: $(MELT_GENERATED_FIRST_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_dynamic \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/warmelt-first-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-dynamic/warmelt-first-0
@@ -188,7 +188,7 @@ melt-stage0-static/warmelt-base-0.so: $(MELT_GENERATED_BASE_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-static/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-static \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/warmelt-base-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-static/warmelt-base-0
@@ -198,7 +198,7 @@ melt-stage0-dynamic/warmelt-base-0.d.so: $(MELT_GENERATED_BASE_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_dynamic \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/warmelt-base-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-dynamic/warmelt-base-0
@@ -212,7 +212,7 @@ melt-stage0-static/warmelt-debug-0.so: $(MELT_GENERATED_DEBUG_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-static/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-static \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/warmelt-debug-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-static/warmelt-debug-0
@@ -222,7 +222,7 @@ melt-stage0-dynamic/warmelt-debug-0.d.so: $(MELT_GENERATED_DEBUG_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_dynamic \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/warmelt-debug-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-dynamic/warmelt-debug-0
@@ -236,7 +236,7 @@ melt-stage0-static/warmelt-macro-0.so: $(MELT_GENERATED_MACRO_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-static/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-static \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/warmelt-macro-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-static/warmelt-macro-0
@@ -246,7 +246,7 @@ melt-stage0-dynamic/warmelt-macro-0.d.so: $(MELT_GENERATED_MACRO_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_dynamic \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/warmelt-macro-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-dynamic/warmelt-macro-0
@@ -260,7 +260,7 @@ melt-stage0-static/warmelt-normal-0.so: $(MELT_GENERATED_NORMAL_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-static/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-static \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/warmelt-normal-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-static/warmelt-normal-0
@@ -270,7 +270,7 @@ melt-stage0-dynamic/warmelt-normal-0.d.so: $(MELT_GENERATED_NORMAL_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_dynamic \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/warmelt-normal-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-dynamic/warmelt-normal-0
@@ -284,7 +284,7 @@ melt-stage0-static/warmelt-normatch-0.so: $(MELT_GENERATED_NORMATCH_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-static/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-static \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/warmelt-normatch-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-static/warmelt-normatch-0
@@ -294,7 +294,7 @@ melt-stage0-dynamic/warmelt-normatch-0.d.so: $(MELT_GENERATED_NORMATCH_C_FILES)
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_dynamic \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/warmelt-normatch-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-dynamic/warmelt-normatch-0
@@ -308,7 +308,7 @@ melt-stage0-static/warmelt-genobj-0.so: $(MELT_GENERATED_GENOBJ_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-static/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-static \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/warmelt-genobj-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-static/warmelt-genobj-0
@@ -318,7 +318,7 @@ melt-stage0-dynamic/warmelt-genobj-0.d.so: $(MELT_GENERATED_GENOBJ_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_dynamic \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/warmelt-genobj-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-dynamic/warmelt-genobj-0
@@ -332,7 +332,7 @@ melt-stage0-static/warmelt-outobj-0.so: $(MELT_GENERATED_OUTOBJ_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-static/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-static \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/warmelt-outobj-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-static/warmelt-outobj-0
@@ -342,7 +342,7 @@ melt-stage0-dynamic/warmelt-outobj-0.d.so: $(MELT_GENERATED_OUTOBJ_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_dynamic \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/warmelt-outobj-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-dynamic/warmelt-outobj-0
@@ -427,7 +427,7 @@ melt-stage1/warmelt-first-1.so: melt-stage1/warmelt-first-1.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage1/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage1 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage1/warmelt-first-1.c \
GCCMELT_MODULE_BINARY=melt-stage1/warmelt-first-1
@@ -437,7 +437,7 @@ melt-stage1/warmelt-first-1.n.so: melt-stage1/warmelt-first-1.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage1/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage1 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage1/warmelt-first-1.c \
GCCMELT_MODULE_BINARY=melt-stage1/warmelt-first-1
@@ -474,7 +474,7 @@ melt-stage1/warmelt-base-1.so: melt-stage1/warmelt-base-1.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage1/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage1 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage1/warmelt-base-1.c \
GCCMELT_MODULE_BINARY=melt-stage1/warmelt-base-1
@@ -484,7 +484,7 @@ melt-stage1/warmelt-base-1.n.so: melt-stage1/warmelt-base-1.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage1/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage1 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage1/warmelt-base-1.c \
GCCMELT_MODULE_BINARY=melt-stage1/warmelt-base-1
@@ -521,7 +521,7 @@ melt-stage1/warmelt-debug-1.so: melt-stage1/warmelt-debug-1.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage1/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage1 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage1/warmelt-debug-1.c \
GCCMELT_MODULE_BINARY=melt-stage1/warmelt-debug-1
@@ -531,7 +531,7 @@ melt-stage1/warmelt-debug-1.n.so: melt-stage1/warmelt-debug-1.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage1/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage1 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage1/warmelt-debug-1.c \
GCCMELT_MODULE_BINARY=melt-stage1/warmelt-debug-1
@@ -568,7 +568,7 @@ melt-stage1/warmelt-macro-1.so: melt-stage1/warmelt-macro-1.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage1/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage1 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage1/warmelt-macro-1.c \
GCCMELT_MODULE_BINARY=melt-stage1/warmelt-macro-1
@@ -578,7 +578,7 @@ melt-stage1/warmelt-macro-1.n.so: melt-stage1/warmelt-macro-1.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage1/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage1 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage1/warmelt-macro-1.c \
GCCMELT_MODULE_BINARY=melt-stage1/warmelt-macro-1
@@ -615,7 +615,7 @@ melt-stage1/warmelt-normal-1.so: melt-stage1/warmelt-normal-1.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage1/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage1 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage1/warmelt-normal-1.c \
GCCMELT_MODULE_BINARY=melt-stage1/warmelt-normal-1
@@ -625,7 +625,7 @@ melt-stage1/warmelt-normal-1.n.so: melt-stage1/warmelt-normal-1.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage1/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage1 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage1/warmelt-normal-1.c \
GCCMELT_MODULE_BINARY=melt-stage1/warmelt-normal-1
@@ -663,7 +663,7 @@ melt-stage1/warmelt-normatch-1.so: melt-stage1/warmelt-normatch-1.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage1/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage1 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage1/warmelt-normatch-1.c \
GCCMELT_MODULE_BINARY=melt-stage1/warmelt-normatch-1
@@ -673,7 +673,7 @@ melt-stage1/warmelt-normatch-1.n.so: melt-stage1/warmelt-normatch-1.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage1/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage1 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage1/warmelt-normatch-1.c \
GCCMELT_MODULE_BINARY=melt-stage1/warmelt-normatch-1
@@ -710,7 +710,7 @@ melt-stage1/warmelt-genobj-1.so: melt-stage1/warmelt-genobj-1.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage1/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage1 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage1/warmelt-genobj-1.c \
GCCMELT_MODULE_BINARY=melt-stage1/warmelt-genobj-1
@@ -720,7 +720,7 @@ melt-stage1/warmelt-genobj-1.n.so: melt-stage1/warmelt-genobj-1.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage1/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage1 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage1/warmelt-genobj-1.c \
GCCMELT_MODULE_BINARY=melt-stage1/warmelt-genobj-1
@@ -757,7 +757,7 @@ melt-stage1/warmelt-outobj-1.so: melt-stage1/warmelt-outobj-1.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage1/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage1 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage1/warmelt-outobj-1.c \
GCCMELT_MODULE_BINARY=melt-stage1/warmelt-outobj-1
@@ -767,7 +767,7 @@ melt-stage1/warmelt-outobj-1.n.so: melt-stage1/warmelt-outobj-1.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage1/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage1 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage1/warmelt-outobj-1.c \
GCCMELT_MODULE_BINARY=melt-stage1/warmelt-outobj-1
@@ -858,7 +858,7 @@ melt-stage2/warmelt-first-2.so: melt-stage2/warmelt-first-2.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage2/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage2 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage2/warmelt-first-2.c \
GCCMELT_MODULE_BINARY=melt-stage2/warmelt-first-2
@@ -868,7 +868,7 @@ melt-stage2/warmelt-first-2.n.so: melt-stage2/warmelt-first-2.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage2/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage2 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage2/warmelt-first-2.c \
GCCMELT_MODULE_BINARY=melt-stage2/warmelt-first-2
@@ -905,7 +905,7 @@ melt-stage2/warmelt-base-2.so: melt-stage2/warmelt-base-2.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage2/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage2 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage2/warmelt-base-2.c \
GCCMELT_MODULE_BINARY=melt-stage2/warmelt-base-2
@@ -915,7 +915,7 @@ melt-stage2/warmelt-base-2.n.so: melt-stage2/warmelt-base-2.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage2/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage2 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage2/warmelt-base-2.c \
GCCMELT_MODULE_BINARY=melt-stage2/warmelt-base-2
@@ -952,7 +952,7 @@ melt-stage2/warmelt-debug-2.so: melt-stage2/warmelt-debug-2.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage2/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage2 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage2/warmelt-debug-2.c \
GCCMELT_MODULE_BINARY=melt-stage2/warmelt-debug-2
@@ -962,7 +962,7 @@ melt-stage2/warmelt-debug-2.n.so: melt-stage2/warmelt-debug-2.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage2/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage2 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage2/warmelt-debug-2.c \
GCCMELT_MODULE_BINARY=melt-stage2/warmelt-debug-2
@@ -999,7 +999,7 @@ melt-stage2/warmelt-macro-2.so: melt-stage2/warmelt-macro-2.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage2/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage2 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage2/warmelt-macro-2.c \
GCCMELT_MODULE_BINARY=melt-stage2/warmelt-macro-2
@@ -1009,7 +1009,7 @@ melt-stage2/warmelt-macro-2.n.so: melt-stage2/warmelt-macro-2.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage2/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage2 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage2/warmelt-macro-2.c \
GCCMELT_MODULE_BINARY=melt-stage2/warmelt-macro-2
@@ -1046,7 +1046,7 @@ melt-stage2/warmelt-normal-2.so: melt-stage2/warmelt-normal-2.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage2/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage2 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage2/warmelt-normal-2.c \
GCCMELT_MODULE_BINARY=melt-stage2/warmelt-normal-2
@@ -1056,7 +1056,7 @@ melt-stage2/warmelt-normal-2.n.so: melt-stage2/warmelt-normal-2.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage2/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage2 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage2/warmelt-normal-2.c \
GCCMELT_MODULE_BINARY=melt-stage2/warmelt-normal-2
@@ -1094,7 +1094,7 @@ melt-stage2/warmelt-normatch-2.so: melt-stage2/warmelt-normatch-2.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage2/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage2 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage2/warmelt-normatch-2.c \
GCCMELT_MODULE_BINARY=melt-stage2/warmelt-normatch-2
@@ -1104,7 +1104,7 @@ melt-stage2/warmelt-normatch-2.n.so: melt-stage2/warmelt-normatch-2.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage2/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage2 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage2/warmelt-normatch-2.c \
GCCMELT_MODULE_BINARY=melt-stage2/warmelt-normatch-2
@@ -1141,7 +1141,7 @@ melt-stage2/warmelt-genobj-2.so: melt-stage2/warmelt-genobj-2.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage2/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage2 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage2/warmelt-genobj-2.c \
GCCMELT_MODULE_BINARY=melt-stage2/warmelt-genobj-2
@@ -1151,7 +1151,7 @@ melt-stage2/warmelt-genobj-2.n.so: melt-stage2/warmelt-genobj-2.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage2/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage2 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage2/warmelt-genobj-2.c \
GCCMELT_MODULE_BINARY=melt-stage2/warmelt-genobj-2
@@ -1188,7 +1188,7 @@ melt-stage2/warmelt-outobj-2.so: melt-stage2/warmelt-outobj-2.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage2/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage2 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage2/warmelt-outobj-2.c \
GCCMELT_MODULE_BINARY=melt-stage2/warmelt-outobj-2
@@ -1198,7 +1198,7 @@ melt-stage2/warmelt-outobj-2.n.so: melt-stage2/warmelt-outobj-2.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage2/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage2 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage2/warmelt-outobj-2.c \
GCCMELT_MODULE_BINARY=melt-stage2/warmelt-outobj-2
@@ -1289,7 +1289,7 @@ melt-stage3/warmelt-first-3.so: melt-stage3/warmelt-first-3.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage3/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage3 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage3/warmelt-first-3.c \
GCCMELT_MODULE_BINARY=melt-stage3/warmelt-first-3
@@ -1299,7 +1299,7 @@ melt-stage3/warmelt-first-3.n.so: melt-stage3/warmelt-first-3.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage3/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage3 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage3/warmelt-first-3.c \
GCCMELT_MODULE_BINARY=melt-stage3/warmelt-first-3
@@ -1336,7 +1336,7 @@ melt-stage3/warmelt-base-3.so: melt-stage3/warmelt-base-3.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage3/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage3 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage3/warmelt-base-3.c \
GCCMELT_MODULE_BINARY=melt-stage3/warmelt-base-3
@@ -1346,7 +1346,7 @@ melt-stage3/warmelt-base-3.n.so: melt-stage3/warmelt-base-3.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage3/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage3 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage3/warmelt-base-3.c \
GCCMELT_MODULE_BINARY=melt-stage3/warmelt-base-3
@@ -1383,7 +1383,7 @@ melt-stage3/warmelt-debug-3.so: melt-stage3/warmelt-debug-3.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage3/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage3 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage3/warmelt-debug-3.c \
GCCMELT_MODULE_BINARY=melt-stage3/warmelt-debug-3
@@ -1393,7 +1393,7 @@ melt-stage3/warmelt-debug-3.n.so: melt-stage3/warmelt-debug-3.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage3/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage3 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage3/warmelt-debug-3.c \
GCCMELT_MODULE_BINARY=melt-stage3/warmelt-debug-3
@@ -1430,7 +1430,7 @@ melt-stage3/warmelt-macro-3.so: melt-stage3/warmelt-macro-3.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage3/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage3 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage3/warmelt-macro-3.c \
GCCMELT_MODULE_BINARY=melt-stage3/warmelt-macro-3
@@ -1440,7 +1440,7 @@ melt-stage3/warmelt-macro-3.n.so: melt-stage3/warmelt-macro-3.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage3/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage3 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage3/warmelt-macro-3.c \
GCCMELT_MODULE_BINARY=melt-stage3/warmelt-macro-3
@@ -1477,7 +1477,7 @@ melt-stage3/warmelt-normal-3.so: melt-stage3/warmelt-normal-3.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage3/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage3 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage3/warmelt-normal-3.c \
GCCMELT_MODULE_BINARY=melt-stage3/warmelt-normal-3
@@ -1487,7 +1487,7 @@ melt-stage3/warmelt-normal-3.n.so: melt-stage3/warmelt-normal-3.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage3/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage3 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage3/warmelt-normal-3.c \
GCCMELT_MODULE_BINARY=melt-stage3/warmelt-normal-3
@@ -1525,7 +1525,7 @@ melt-stage3/warmelt-normatch-3.so: melt-stage3/warmelt-normatch-3.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage3/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage3 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage3/warmelt-normatch-3.c \
GCCMELT_MODULE_BINARY=melt-stage3/warmelt-normatch-3
@@ -1535,7 +1535,7 @@ melt-stage3/warmelt-normatch-3.n.so: melt-stage3/warmelt-normatch-3.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage3/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage3 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage3/warmelt-normatch-3.c \
GCCMELT_MODULE_BINARY=melt-stage3/warmelt-normatch-3
@@ -1572,7 +1572,7 @@ melt-stage3/warmelt-genobj-3.so: melt-stage3/warmelt-genobj-3.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage3/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage3 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage3/warmelt-genobj-3.c \
GCCMELT_MODULE_BINARY=melt-stage3/warmelt-genobj-3
@@ -1582,7 +1582,7 @@ melt-stage3/warmelt-genobj-3.n.so: melt-stage3/warmelt-genobj-3.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage3/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage3 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage3/warmelt-genobj-3.c \
GCCMELT_MODULE_BINARY=melt-stage3/warmelt-genobj-3
@@ -1619,7 +1619,7 @@ melt-stage3/warmelt-outobj-3.so: melt-stage3/warmelt-outobj-3.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage3/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage3 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage3/warmelt-outobj-3.c \
GCCMELT_MODULE_BINARY=melt-stage3/warmelt-outobj-3
@@ -1629,7 +1629,7 @@ melt-stage3/warmelt-outobj-3.n.so: melt-stage3/warmelt-outobj-3.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage3/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage3 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage3/warmelt-outobj-3.c \
GCCMELT_MODULE_BINARY=melt-stage3/warmelt-outobj-3
--
1.7.4.1
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 2/3] Fix double '/' in MELT build process
2011-03-01 11:44 [MELT] Fixing compilation process Alexandre Lissy
2011-03-01 11:44 ` [PATCH 3/3] Regenerating melt-build.mk Alexandre Lissy
@ 2011-03-01 11:44 ` Alexandre Lissy
2011-03-01 11:44 ` [PATCH 1/3] Fix RPM compilation Alexandre Lissy
2011-03-01 21:31 ` [MELT] Fixing compilation process Basile Starynkevitch
3 siblings, 0 replies; 11+ messages in thread
From: Alexandre Lissy @ 2011-03-01 11:44 UTC (permalink / raw)
To: gcc-patches; +Cc: Alexandre Lissy
Double slashes while building are a problem for RPM's debugedit tool,
which seems to be 'well-known', while never fixed. The only solution is
to fix the build process. Also, remove any trailing slash from
MELTMODULE_SRCDIR variable, since slashes are added when used.
---
gcc/melt-build.tpl | 8 ++++----
gcc/melt-module.mk | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/gcc/melt-build.tpl b/gcc/melt-build.tpl
index 20c0012..4666990 100644
--- a/gcc/melt-build.tpl
+++ b/gcc/melt-build.tpl
@@ -107,7 +107,7 @@ melt-stage0-static/[+base+]-0.so: $(MELT_GENERATED_[+mkvarsuf+]_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-static/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-static \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/[+base+]-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-static/[+base+]-0
@@ -117,7 +117,7 @@ melt-stage0-dynamic/[+base+]-0.d.so: $(MELT_GENERATED_[+mkvarsuf+]_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_dynamic \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/[+base+]-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-dynamic/[+base+]-0
@@ -181,7 +181,7 @@ $(MELT_STAGE_ZERO):
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=[+melt_stage+]/ \
+ GCCMELT_MODULE_WORKSPACE=[+melt_stage+] \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=[+melt_stage+]/[+ (. outbase)+]-[+(. stageindex)+].c \
GCCMELT_MODULE_BINARY=[+melt_stage+]/[+(. outbase)+]-[+(. stageindex)+]
@@ -191,7 +191,7 @@ $(MELT_STAGE_ZERO):
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=[+melt_stage+]/ \
+ GCCMELT_MODULE_WORKSPACE=[+melt_stage+] \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=[+melt_stage+]/[+ (. outbase)+]-[+(. stageindex)+].c \
GCCMELT_MODULE_BINARY=[+melt_stage+]/[+(. outbase)+]-[+(. stageindex)+]
diff --git a/gcc/melt-module.mk b/gcc/melt-module.mk
index 38dad9b..3f45736 100644
--- a/gcc/melt-module.mk
+++ b/gcc/melt-module.mk
@@ -46,7 +46,7 @@ endif
MELTMODULE_BASENAME:=$(basename $(GCCMELT_MODULE_SOURCE))
MELTMODULE_PLAIN:=$(notdir $(MELTMODULE_BASENAME))
-MELTMODULE_SRCDIR:=$(dir $(GCCMELT_MODULE_SOURCE))
+MELTMODULE_SRCDIR:=$(patsubst %/, %, $(dir $(GCCMELT_MODULE_SOURCE)))
## The .d.so & .n.so suffixes are wired in melt-runtime.c!
--
1.7.4.1
^ permalink raw reply [flat|nested] 11+ messages in thread
* [MELT] Fixing compilation process
@ 2011-03-01 11:44 Alexandre Lissy
2011-03-01 11:44 ` [PATCH 3/3] Regenerating melt-build.mk Alexandre Lissy
` (3 more replies)
0 siblings, 4 replies; 11+ messages in thread
From: Alexandre Lissy @ 2011-03-01 11:44 UTC (permalink / raw)
To: gcc-patches
Hello,
I'm submitting those patches that deals with gcc's melt branch. Their
purpose is to fix the compilation process for two issues that I have
spotted while preparing RPMs for Mandriva:
- We (I don't know why) have -Wp,-D_FORTIFY_SOURCE=2 that gets in the
CFLAGS, and that's grabbed by MELT to be given to cc1 process.
However, this provokes an error, as -Wp,-D_FORFITY_SOURCE=2 is said
to be valid for the driver but not for cc1. Therefore, the fix I
propose is to strip any reference to -Wp,-D_FORTIFY_SOURCE=2 in
CFLAGS that melt passes to cc1 directly.
- We also, in the same build process, passes -pipe directly to cc1.
This results in the same errors, therefore the proposed patch also
removes -pipe from flags for cc1.
This is it for the first patch.
- Another issue is that while building melt modules, some paths are
constructed with double slashes. It's bogus for RPM's debugedit, so I
propose a patch that removes unnecessary slashes from the build
process.
This is for the second patch
- Latest patch is a trivial run of 'autogen melt-build.def'.
With those modifications, latest revision of melt-branch is able to
compile (not yet finally packaged, but at least we build!).
And I forgot to add that we are covered by agreement RT 319903.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [MELT] Fixing compilation process
2011-03-01 11:44 [MELT] Fixing compilation process Alexandre Lissy
` (2 preceding siblings ...)
2011-03-01 11:44 ` [PATCH 1/3] Fix RPM compilation Alexandre Lissy
@ 2011-03-01 21:31 ` Basile Starynkevitch
2011-03-07 11:35 ` [MELT] Fixing compilation issues Alexandre Lissy
3 siblings, 1 reply; 11+ messages in thread
From: Basile Starynkevitch @ 2011-03-01 21:31 UTC (permalink / raw)
To: Alexandre Lissy; +Cc: gcc-patches
On Tue, 1 Mar 2011 12:43:46 +0100
Alexandre Lissy <alissy@mandriva.com> wrote:
> Hello,
>
> I'm submitting those patches that deals with gcc's melt branch.
[...]
Thanks for the patches. But you forgot the ChangeLog.MELT & gcc/ChangeLog.MELT entries!
(I'm uneasy to guess them by myself). Once I've got them, I would be delighted to apply the patches!
>
> And I forgot to add that we are covered by agreement RT 319903.
>
BTW (to all), is there anything special Alexandre can do to get a svn+ssh write access to GCC?
Regards.
--
Basile STARYNKEVITCH http://starynkevitch.net/Basile/
email: basile<at>starynkevitch<dot>net mobile: +33 6 8501 2359
8, rue de la Faiencerie, 92340 Bourg La Reine, France
*** opinions {are only mine, sont seulement les miennes} ***
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 1/4] Fix RPM compilation
2011-03-07 11:35 ` [MELT] Fixing compilation issues Alexandre Lissy
2011-03-07 11:35 ` [PATCH 2/4] Fix double '/' in MELT build process Alexandre Lissy
2011-03-07 11:35 ` [PATCH 3/4] Regenerating melt-build.mk Alexandre Lissy
@ 2011-03-07 11:35 ` Alexandre Lissy
2011-03-07 11:35 ` [PATCH 4/4] Updating MELT ChangeLog Alexandre Lissy
3 siblings, 0 replies; 11+ messages in thread
From: Alexandre Lissy @ 2011-03-07 11:35 UTC (permalink / raw)
To: gcc-patches; +Cc: Alexandre Lissy
The GCC's options -pipe and -Wp,-D_FORTIFY_SOURCE=2 are passed by
default by Mandriva's GCC RPM spec file, and end up in some parts of
MELT CFLAGS. But they should not end up there.
---
gcc/Makefile.in | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 3f1ffa0..f841776 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -5341,6 +5341,7 @@ MELT_RAW_CFLAGS= \
## since the generated routines are no more huge (since the
## initialization code is split in several chunks).. Likewise, avoid
## passing -gtoggle and -g
+## Also remove -pipe and -Wp,-D_FORTIFY_SOURCE=2
MELTHERE_CFLAGS= $(filter-out -g, $(filter-out -gtoggle, $(MELT_RAW_CFLAGS)))
export MELTHERE_CFLAGS
@@ -5430,7 +5431,10 @@ melt_make_source_dir=$(srcdir)/melt
melt_make_module_dir=$(objdir)
melt_make_move=$(SHELL) $(srcdir)/../move-if-change
## Don't use := definitions here!
-melt_make_cc1flags= -I. $(MELTHERE_CFLAGS) -I $(melt_build_include_dir)
+## CC1 forbids -pipe and -Wp,-D_FORTIFY_SOURCE=2
+comma= ,
+MELTHERE_CC1_CFLAGS=$(filter-out -pipe -Wp$(comma)-D_FORTIFY_SOURCE=2, $(MELTHERE_CFLAGS))
+melt_make_cc1flags= -I. $(MELTHERE_CC1_CFLAGS) -I $(melt_build_include_dir)
melt_cflags= -I. $(MELTHERE_CFLAGS) -I $(melt_build_include_dir)
export melt_cflags
## extra cflags are for compiling applicative MELT files, e.g. xtramelt*.c
--
1.7.4.1
^ permalink raw reply [flat|nested] 11+ messages in thread
* [MELT] Fixing compilation issues
2011-03-01 21:31 ` [MELT] Fixing compilation process Basile Starynkevitch
@ 2011-03-07 11:35 ` Alexandre Lissy
2011-03-07 11:35 ` [PATCH 2/4] Fix double '/' in MELT build process Alexandre Lissy
` (3 more replies)
0 siblings, 4 replies; 11+ messages in thread
From: Alexandre Lissy @ 2011-03-07 11:35 UTC (permalink / raw)
To: gcc-patches
Hello,
Sorry for the delay, but I had no time to perform this small change while
attending ROADEF 2011 :).
So, here we go, same patches again, with ChangeLog.MELT updated.
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 3/4] Regenerating melt-build.mk
2011-03-07 11:35 ` [MELT] Fixing compilation issues Alexandre Lissy
2011-03-07 11:35 ` [PATCH 2/4] Fix double '/' in MELT build process Alexandre Lissy
@ 2011-03-07 11:35 ` Alexandre Lissy
2011-03-07 11:35 ` [PATCH 1/4] Fix RPM compilation Alexandre Lissy
2011-03-07 11:35 ` [PATCH 4/4] Updating MELT ChangeLog Alexandre Lissy
3 siblings, 0 replies; 11+ messages in thread
From: Alexandre Lissy @ 2011-03-07 11:35 UTC (permalink / raw)
To: gcc-patches; +Cc: Alexandre Lissy
---
gcc/melt-build.mk | 128 ++++++++++++++++++++++++++--------------------------
1 files changed, 64 insertions(+), 64 deletions(-)
diff --git a/gcc/melt-build.mk b/gcc/melt-build.mk
index f00e43b..e75229e 100644
--- a/gcc/melt-build.mk
+++ b/gcc/melt-build.mk
@@ -164,7 +164,7 @@ melt-stage0-static/warmelt-first-0.so: $(MELT_GENERATED_FIRST_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-static/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-static \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/warmelt-first-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-static/warmelt-first-0
@@ -174,7 +174,7 @@ melt-stage0-dynamic/warmelt-first-0.d.so: $(MELT_GENERATED_FIRST_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_dynamic \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/warmelt-first-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-dynamic/warmelt-first-0
@@ -188,7 +188,7 @@ melt-stage0-static/warmelt-base-0.so: $(MELT_GENERATED_BASE_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-static/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-static \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/warmelt-base-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-static/warmelt-base-0
@@ -198,7 +198,7 @@ melt-stage0-dynamic/warmelt-base-0.d.so: $(MELT_GENERATED_BASE_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_dynamic \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/warmelt-base-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-dynamic/warmelt-base-0
@@ -212,7 +212,7 @@ melt-stage0-static/warmelt-debug-0.so: $(MELT_GENERATED_DEBUG_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-static/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-static \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/warmelt-debug-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-static/warmelt-debug-0
@@ -222,7 +222,7 @@ melt-stage0-dynamic/warmelt-debug-0.d.so: $(MELT_GENERATED_DEBUG_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_dynamic \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/warmelt-debug-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-dynamic/warmelt-debug-0
@@ -236,7 +236,7 @@ melt-stage0-static/warmelt-macro-0.so: $(MELT_GENERATED_MACRO_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-static/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-static \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/warmelt-macro-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-static/warmelt-macro-0
@@ -246,7 +246,7 @@ melt-stage0-dynamic/warmelt-macro-0.d.so: $(MELT_GENERATED_MACRO_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_dynamic \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/warmelt-macro-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-dynamic/warmelt-macro-0
@@ -260,7 +260,7 @@ melt-stage0-static/warmelt-normal-0.so: $(MELT_GENERATED_NORMAL_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-static/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-static \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/warmelt-normal-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-static/warmelt-normal-0
@@ -270,7 +270,7 @@ melt-stage0-dynamic/warmelt-normal-0.d.so: $(MELT_GENERATED_NORMAL_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_dynamic \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/warmelt-normal-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-dynamic/warmelt-normal-0
@@ -284,7 +284,7 @@ melt-stage0-static/warmelt-normatch-0.so: $(MELT_GENERATED_NORMATCH_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-static/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-static \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/warmelt-normatch-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-static/warmelt-normatch-0
@@ -294,7 +294,7 @@ melt-stage0-dynamic/warmelt-normatch-0.d.so: $(MELT_GENERATED_NORMATCH_C_FILES)
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_dynamic \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/warmelt-normatch-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-dynamic/warmelt-normatch-0
@@ -308,7 +308,7 @@ melt-stage0-static/warmelt-genobj-0.so: $(MELT_GENERATED_GENOBJ_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-static/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-static \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/warmelt-genobj-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-static/warmelt-genobj-0
@@ -318,7 +318,7 @@ melt-stage0-dynamic/warmelt-genobj-0.d.so: $(MELT_GENERATED_GENOBJ_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_dynamic \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/warmelt-genobj-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-dynamic/warmelt-genobj-0
@@ -332,7 +332,7 @@ melt-stage0-static/warmelt-outobj-0.so: $(MELT_GENERATED_OUTOBJ_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-static/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-static \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/warmelt-outobj-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-static/warmelt-outobj-0
@@ -342,7 +342,7 @@ melt-stage0-dynamic/warmelt-outobj-0.d.so: $(MELT_GENERATED_OUTOBJ_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_dynamic \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/warmelt-outobj-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-dynamic/warmelt-outobj-0
@@ -427,7 +427,7 @@ melt-stage1/warmelt-first-1.so: melt-stage1/warmelt-first-1.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage1/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage1 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage1/warmelt-first-1.c \
GCCMELT_MODULE_BINARY=melt-stage1/warmelt-first-1
@@ -437,7 +437,7 @@ melt-stage1/warmelt-first-1.n.so: melt-stage1/warmelt-first-1.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage1/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage1 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage1/warmelt-first-1.c \
GCCMELT_MODULE_BINARY=melt-stage1/warmelt-first-1
@@ -474,7 +474,7 @@ melt-stage1/warmelt-base-1.so: melt-stage1/warmelt-base-1.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage1/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage1 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage1/warmelt-base-1.c \
GCCMELT_MODULE_BINARY=melt-stage1/warmelt-base-1
@@ -484,7 +484,7 @@ melt-stage1/warmelt-base-1.n.so: melt-stage1/warmelt-base-1.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage1/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage1 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage1/warmelt-base-1.c \
GCCMELT_MODULE_BINARY=melt-stage1/warmelt-base-1
@@ -521,7 +521,7 @@ melt-stage1/warmelt-debug-1.so: melt-stage1/warmelt-debug-1.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage1/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage1 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage1/warmelt-debug-1.c \
GCCMELT_MODULE_BINARY=melt-stage1/warmelt-debug-1
@@ -531,7 +531,7 @@ melt-stage1/warmelt-debug-1.n.so: melt-stage1/warmelt-debug-1.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage1/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage1 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage1/warmelt-debug-1.c \
GCCMELT_MODULE_BINARY=melt-stage1/warmelt-debug-1
@@ -568,7 +568,7 @@ melt-stage1/warmelt-macro-1.so: melt-stage1/warmelt-macro-1.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage1/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage1 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage1/warmelt-macro-1.c \
GCCMELT_MODULE_BINARY=melt-stage1/warmelt-macro-1
@@ -578,7 +578,7 @@ melt-stage1/warmelt-macro-1.n.so: melt-stage1/warmelt-macro-1.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage1/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage1 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage1/warmelt-macro-1.c \
GCCMELT_MODULE_BINARY=melt-stage1/warmelt-macro-1
@@ -615,7 +615,7 @@ melt-stage1/warmelt-normal-1.so: melt-stage1/warmelt-normal-1.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage1/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage1 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage1/warmelt-normal-1.c \
GCCMELT_MODULE_BINARY=melt-stage1/warmelt-normal-1
@@ -625,7 +625,7 @@ melt-stage1/warmelt-normal-1.n.so: melt-stage1/warmelt-normal-1.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage1/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage1 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage1/warmelt-normal-1.c \
GCCMELT_MODULE_BINARY=melt-stage1/warmelt-normal-1
@@ -663,7 +663,7 @@ melt-stage1/warmelt-normatch-1.so: melt-stage1/warmelt-normatch-1.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage1/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage1 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage1/warmelt-normatch-1.c \
GCCMELT_MODULE_BINARY=melt-stage1/warmelt-normatch-1
@@ -673,7 +673,7 @@ melt-stage1/warmelt-normatch-1.n.so: melt-stage1/warmelt-normatch-1.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage1/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage1 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage1/warmelt-normatch-1.c \
GCCMELT_MODULE_BINARY=melt-stage1/warmelt-normatch-1
@@ -710,7 +710,7 @@ melt-stage1/warmelt-genobj-1.so: melt-stage1/warmelt-genobj-1.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage1/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage1 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage1/warmelt-genobj-1.c \
GCCMELT_MODULE_BINARY=melt-stage1/warmelt-genobj-1
@@ -720,7 +720,7 @@ melt-stage1/warmelt-genobj-1.n.so: melt-stage1/warmelt-genobj-1.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage1/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage1 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage1/warmelt-genobj-1.c \
GCCMELT_MODULE_BINARY=melt-stage1/warmelt-genobj-1
@@ -757,7 +757,7 @@ melt-stage1/warmelt-outobj-1.so: melt-stage1/warmelt-outobj-1.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage1/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage1 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage1/warmelt-outobj-1.c \
GCCMELT_MODULE_BINARY=melt-stage1/warmelt-outobj-1
@@ -767,7 +767,7 @@ melt-stage1/warmelt-outobj-1.n.so: melt-stage1/warmelt-outobj-1.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage1/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage1 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage1/warmelt-outobj-1.c \
GCCMELT_MODULE_BINARY=melt-stage1/warmelt-outobj-1
@@ -858,7 +858,7 @@ melt-stage2/warmelt-first-2.so: melt-stage2/warmelt-first-2.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage2/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage2 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage2/warmelt-first-2.c \
GCCMELT_MODULE_BINARY=melt-stage2/warmelt-first-2
@@ -868,7 +868,7 @@ melt-stage2/warmelt-first-2.n.so: melt-stage2/warmelt-first-2.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage2/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage2 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage2/warmelt-first-2.c \
GCCMELT_MODULE_BINARY=melt-stage2/warmelt-first-2
@@ -905,7 +905,7 @@ melt-stage2/warmelt-base-2.so: melt-stage2/warmelt-base-2.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage2/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage2 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage2/warmelt-base-2.c \
GCCMELT_MODULE_BINARY=melt-stage2/warmelt-base-2
@@ -915,7 +915,7 @@ melt-stage2/warmelt-base-2.n.so: melt-stage2/warmelt-base-2.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage2/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage2 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage2/warmelt-base-2.c \
GCCMELT_MODULE_BINARY=melt-stage2/warmelt-base-2
@@ -952,7 +952,7 @@ melt-stage2/warmelt-debug-2.so: melt-stage2/warmelt-debug-2.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage2/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage2 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage2/warmelt-debug-2.c \
GCCMELT_MODULE_BINARY=melt-stage2/warmelt-debug-2
@@ -962,7 +962,7 @@ melt-stage2/warmelt-debug-2.n.so: melt-stage2/warmelt-debug-2.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage2/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage2 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage2/warmelt-debug-2.c \
GCCMELT_MODULE_BINARY=melt-stage2/warmelt-debug-2
@@ -999,7 +999,7 @@ melt-stage2/warmelt-macro-2.so: melt-stage2/warmelt-macro-2.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage2/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage2 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage2/warmelt-macro-2.c \
GCCMELT_MODULE_BINARY=melt-stage2/warmelt-macro-2
@@ -1009,7 +1009,7 @@ melt-stage2/warmelt-macro-2.n.so: melt-stage2/warmelt-macro-2.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage2/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage2 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage2/warmelt-macro-2.c \
GCCMELT_MODULE_BINARY=melt-stage2/warmelt-macro-2
@@ -1046,7 +1046,7 @@ melt-stage2/warmelt-normal-2.so: melt-stage2/warmelt-normal-2.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage2/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage2 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage2/warmelt-normal-2.c \
GCCMELT_MODULE_BINARY=melt-stage2/warmelt-normal-2
@@ -1056,7 +1056,7 @@ melt-stage2/warmelt-normal-2.n.so: melt-stage2/warmelt-normal-2.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage2/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage2 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage2/warmelt-normal-2.c \
GCCMELT_MODULE_BINARY=melt-stage2/warmelt-normal-2
@@ -1094,7 +1094,7 @@ melt-stage2/warmelt-normatch-2.so: melt-stage2/warmelt-normatch-2.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage2/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage2 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage2/warmelt-normatch-2.c \
GCCMELT_MODULE_BINARY=melt-stage2/warmelt-normatch-2
@@ -1104,7 +1104,7 @@ melt-stage2/warmelt-normatch-2.n.so: melt-stage2/warmelt-normatch-2.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage2/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage2 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage2/warmelt-normatch-2.c \
GCCMELT_MODULE_BINARY=melt-stage2/warmelt-normatch-2
@@ -1141,7 +1141,7 @@ melt-stage2/warmelt-genobj-2.so: melt-stage2/warmelt-genobj-2.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage2/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage2 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage2/warmelt-genobj-2.c \
GCCMELT_MODULE_BINARY=melt-stage2/warmelt-genobj-2
@@ -1151,7 +1151,7 @@ melt-stage2/warmelt-genobj-2.n.so: melt-stage2/warmelt-genobj-2.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage2/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage2 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage2/warmelt-genobj-2.c \
GCCMELT_MODULE_BINARY=melt-stage2/warmelt-genobj-2
@@ -1188,7 +1188,7 @@ melt-stage2/warmelt-outobj-2.so: melt-stage2/warmelt-outobj-2.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage2/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage2 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage2/warmelt-outobj-2.c \
GCCMELT_MODULE_BINARY=melt-stage2/warmelt-outobj-2
@@ -1198,7 +1198,7 @@ melt-stage2/warmelt-outobj-2.n.so: melt-stage2/warmelt-outobj-2.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage2/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage2 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage2/warmelt-outobj-2.c \
GCCMELT_MODULE_BINARY=melt-stage2/warmelt-outobj-2
@@ -1289,7 +1289,7 @@ melt-stage3/warmelt-first-3.so: melt-stage3/warmelt-first-3.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage3/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage3 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage3/warmelt-first-3.c \
GCCMELT_MODULE_BINARY=melt-stage3/warmelt-first-3
@@ -1299,7 +1299,7 @@ melt-stage3/warmelt-first-3.n.so: melt-stage3/warmelt-first-3.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage3/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage3 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage3/warmelt-first-3.c \
GCCMELT_MODULE_BINARY=melt-stage3/warmelt-first-3
@@ -1336,7 +1336,7 @@ melt-stage3/warmelt-base-3.so: melt-stage3/warmelt-base-3.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage3/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage3 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage3/warmelt-base-3.c \
GCCMELT_MODULE_BINARY=melt-stage3/warmelt-base-3
@@ -1346,7 +1346,7 @@ melt-stage3/warmelt-base-3.n.so: melt-stage3/warmelt-base-3.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage3/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage3 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage3/warmelt-base-3.c \
GCCMELT_MODULE_BINARY=melt-stage3/warmelt-base-3
@@ -1383,7 +1383,7 @@ melt-stage3/warmelt-debug-3.so: melt-stage3/warmelt-debug-3.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage3/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage3 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage3/warmelt-debug-3.c \
GCCMELT_MODULE_BINARY=melt-stage3/warmelt-debug-3
@@ -1393,7 +1393,7 @@ melt-stage3/warmelt-debug-3.n.so: melt-stage3/warmelt-debug-3.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage3/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage3 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage3/warmelt-debug-3.c \
GCCMELT_MODULE_BINARY=melt-stage3/warmelt-debug-3
@@ -1430,7 +1430,7 @@ melt-stage3/warmelt-macro-3.so: melt-stage3/warmelt-macro-3.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage3/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage3 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage3/warmelt-macro-3.c \
GCCMELT_MODULE_BINARY=melt-stage3/warmelt-macro-3
@@ -1440,7 +1440,7 @@ melt-stage3/warmelt-macro-3.n.so: melt-stage3/warmelt-macro-3.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage3/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage3 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage3/warmelt-macro-3.c \
GCCMELT_MODULE_BINARY=melt-stage3/warmelt-macro-3
@@ -1477,7 +1477,7 @@ melt-stage3/warmelt-normal-3.so: melt-stage3/warmelt-normal-3.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage3/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage3 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage3/warmelt-normal-3.c \
GCCMELT_MODULE_BINARY=melt-stage3/warmelt-normal-3
@@ -1487,7 +1487,7 @@ melt-stage3/warmelt-normal-3.n.so: melt-stage3/warmelt-normal-3.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage3/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage3 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage3/warmelt-normal-3.c \
GCCMELT_MODULE_BINARY=melt-stage3/warmelt-normal-3
@@ -1525,7 +1525,7 @@ melt-stage3/warmelt-normatch-3.so: melt-stage3/warmelt-normatch-3.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage3/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage3 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage3/warmelt-normatch-3.c \
GCCMELT_MODULE_BINARY=melt-stage3/warmelt-normatch-3
@@ -1535,7 +1535,7 @@ melt-stage3/warmelt-normatch-3.n.so: melt-stage3/warmelt-normatch-3.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage3/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage3 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage3/warmelt-normatch-3.c \
GCCMELT_MODULE_BINARY=melt-stage3/warmelt-normatch-3
@@ -1572,7 +1572,7 @@ melt-stage3/warmelt-genobj-3.so: melt-stage3/warmelt-genobj-3.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage3/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage3 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage3/warmelt-genobj-3.c \
GCCMELT_MODULE_BINARY=melt-stage3/warmelt-genobj-3
@@ -1582,7 +1582,7 @@ melt-stage3/warmelt-genobj-3.n.so: melt-stage3/warmelt-genobj-3.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage3/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage3 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage3/warmelt-genobj-3.c \
GCCMELT_MODULE_BINARY=melt-stage3/warmelt-genobj-3
@@ -1619,7 +1619,7 @@ melt-stage3/warmelt-outobj-3.so: melt-stage3/warmelt-outobj-3.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage3/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage3 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage3/warmelt-outobj-3.c \
GCCMELT_MODULE_BINARY=melt-stage3/warmelt-outobj-3
@@ -1629,7 +1629,7 @@ melt-stage3/warmelt-outobj-3.n.so: melt-stage3/warmelt-outobj-3.c \
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=melt-stage3/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage3 \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=melt-stage3/warmelt-outobj-3.c \
GCCMELT_MODULE_BINARY=melt-stage3/warmelt-outobj-3
--
1.7.4.1
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 4/4] Updating MELT ChangeLog
2011-03-07 11:35 ` [MELT] Fixing compilation issues Alexandre Lissy
` (2 preceding siblings ...)
2011-03-07 11:35 ` [PATCH 1/4] Fix RPM compilation Alexandre Lissy
@ 2011-03-07 11:35 ` Alexandre Lissy
2011-03-07 14:50 ` Basile Starynkevitch
3 siblings, 1 reply; 11+ messages in thread
From: Alexandre Lissy @ 2011-03-07 11:35 UTC (permalink / raw)
To: gcc-patches; +Cc: Alexandre Lissy
---
ChangeLog.MELT | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ChangeLog.MELT b/ChangeLog.MELT
index b18e8ff..0e52116 100644
--- a/ChangeLog.MELT
+++ b/ChangeLog.MELT
@@ -1,3 +1,7 @@
+2011-03-07 Alexandre Lissy <alissy@mandriva.com>
+
+ * Fixing issues in compilation process for RPM packaging
+ * Regenerating melt-build.mk
2011-02-07 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 169877 [probably!]
--
1.7.4.1
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 2/4] Fix double '/' in MELT build process
2011-03-07 11:35 ` [MELT] Fixing compilation issues Alexandre Lissy
@ 2011-03-07 11:35 ` Alexandre Lissy
2011-03-07 11:35 ` [PATCH 3/4] Regenerating melt-build.mk Alexandre Lissy
` (2 subsequent siblings)
3 siblings, 0 replies; 11+ messages in thread
From: Alexandre Lissy @ 2011-03-07 11:35 UTC (permalink / raw)
To: gcc-patches; +Cc: Alexandre Lissy
Double slashes while building are a problem for RPM's debugedit tool,
which seems to be 'well-known', while never fixed. The only solution is
to fix the build process. Also, remove any trailing slash from
MELTMODULE_SRCDIR variable, since slashes are added when used.
---
gcc/melt-build.tpl | 8 ++++----
gcc/melt-module.mk | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/gcc/melt-build.tpl b/gcc/melt-build.tpl
index 20c0012..4666990 100644
--- a/gcc/melt-build.tpl
+++ b/gcc/melt-build.tpl
@@ -107,7 +107,7 @@ melt-stage0-static/[+base+]-0.so: $(MELT_GENERATED_[+mkvarsuf+]_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-static/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-static \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/[+base+]-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-static/[+base+]-0
@@ -117,7 +117,7 @@ melt-stage0-dynamic/[+base+]-0.d.so: $(MELT_GENERATED_[+mkvarsuf+]_C_FILES) \
melt-run.h melt-runtime.h melt-runtime.c \
melt-predef.h $(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_dynamic \
- GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic/ \
+ GCCMELT_MODULE_WORKSPACE=melt-stage0-dynamic \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=$(melt_make_source_dir)/generated/[+base+]-0.c \
GCCMELT_MODULE_BINARY=melt-stage0-dynamic/[+base+]-0
@@ -181,7 +181,7 @@ $(MELT_STAGE_ZERO):
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module \
- GCCMELT_MODULE_WORKSPACE=[+melt_stage+]/ \
+ GCCMELT_MODULE_WORKSPACE=[+melt_stage+] \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=[+melt_stage+]/[+ (. outbase)+]-[+(. stageindex)+].c \
GCCMELT_MODULE_BINARY=[+melt_stage+]/[+(. outbase)+]-[+(. stageindex)+]
@@ -191,7 +191,7 @@ $(MELT_STAGE_ZERO):
melt-run.h melt-runtime.h melt-predef.h \
$(melt_make_cc1_dependency)
+$(MELT_MAKE_MODULE) melt_module_withoutline \
- GCCMELT_MODULE_WORKSPACE=[+melt_stage+]/ \
+ GCCMELT_MODULE_WORKSPACE=[+melt_stage+] \
GCCMELT_CFLAGS="$(melt_cflags)" \
GCCMELT_MODULE_SOURCE=[+melt_stage+]/[+ (. outbase)+]-[+(. stageindex)+].c \
GCCMELT_MODULE_BINARY=[+melt_stage+]/[+(. outbase)+]-[+(. stageindex)+]
diff --git a/gcc/melt-module.mk b/gcc/melt-module.mk
index 38dad9b..3f45736 100644
--- a/gcc/melt-module.mk
+++ b/gcc/melt-module.mk
@@ -46,7 +46,7 @@ endif
MELTMODULE_BASENAME:=$(basename $(GCCMELT_MODULE_SOURCE))
MELTMODULE_PLAIN:=$(notdir $(MELTMODULE_BASENAME))
-MELTMODULE_SRCDIR:=$(dir $(GCCMELT_MODULE_SOURCE))
+MELTMODULE_SRCDIR:=$(patsubst %/, %, $(dir $(GCCMELT_MODULE_SOURCE)))
## The .d.so & .n.so suffixes are wired in melt-runtime.c!
--
1.7.4.1
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 4/4] Updating MELT ChangeLog
2011-03-07 11:35 ` [PATCH 4/4] Updating MELT ChangeLog Alexandre Lissy
@ 2011-03-07 14:50 ` Basile Starynkevitch
0 siblings, 0 replies; 11+ messages in thread
From: Basile Starynkevitch @ 2011-03-07 14:50 UTC (permalink / raw)
To: Alexandre Lissy; +Cc: gcc-patches
On Mon, 7 Mar 2011 12:35:24 +0100
Alexandre Lissy <alissy@mandriva.com> wrote:
> ---
> ChangeLog.MELT | 4 ++++
> 1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/ChangeLog.MELT b/ChangeLog.MELT
> index b18e8ff..0e52116 100644
> --- a/ChangeLog.MELT
> +++ b/ChangeLog.MELT
> @@ -1,3 +1,7 @@
> +2011-03-07 Alexandre Lissy <alissy@mandriva.com>
> +
> + * Fixing issues in compilation process for RPM packaging
> + * Regenerating melt-build.mk
Thanks. The ChangeLog entries above are slightly incorrect (they should mention files and when appropriate, functions). I improved them as
2011-03-07 Alexandre Lissy <alissy@mandriva.com>
* melt-build.tpl: Fix issues in compilation process for RPM
packaging on GCCMELT_MODULE_WORKSPACE.
* Makefile.in (MELTHERE_CC1_CFLAGS, mekt_make_cc1flags): Ditto.
* melt-build.mk: Regenerate.
And so I committed revision 170736 of the MELT branch.
Regards.
--
Basile STARYNKEVITCH http://starynkevitch.net/Basile/
email: basile<at>starynkevitch<dot>net mobile: +33 6 8501 2359
8, rue de la Faiencerie, 92340 Bourg La Reine, France
*** opinions {are only mine, sont seulement les miennes} ***
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2011-03-07 14:50 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-03-01 11:44 [MELT] Fixing compilation process Alexandre Lissy
2011-03-01 11:44 ` [PATCH 3/3] Regenerating melt-build.mk Alexandre Lissy
2011-03-01 11:44 ` [PATCH 2/3] Fix double '/' in MELT build process Alexandre Lissy
2011-03-01 11:44 ` [PATCH 1/3] Fix RPM compilation Alexandre Lissy
2011-03-01 21:31 ` [MELT] Fixing compilation process Basile Starynkevitch
2011-03-07 11:35 ` [MELT] Fixing compilation issues Alexandre Lissy
2011-03-07 11:35 ` [PATCH 2/4] Fix double '/' in MELT build process Alexandre Lissy
2011-03-07 11:35 ` [PATCH 3/4] Regenerating melt-build.mk Alexandre Lissy
2011-03-07 11:35 ` [PATCH 1/4] Fix RPM compilation Alexandre Lissy
2011-03-07 11:35 ` [PATCH 4/4] Updating MELT ChangeLog Alexandre Lissy
2011-03-07 14:50 ` Basile Starynkevitch
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).