avoid conflicts between Parrot and Moar Makefile variables

rakudo · Jan 16, 2014 · 347c9a4 · 347c9a4
1 parent 2a47e8e
commit 347c9a4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 23 deletions.
diff --git a/tools/build/Makefile-Moar.in b/tools/build/Makefile-Moar.in
@@ -1,13 +1,10 @@
-CC      = @moar::cc@
-LD      = @moar::ld@
-CFLAGS  = @moar::cflags@ @moar::ccmiscflags@ @moar::ccoptiflags@ @moar::ccwarnflags@
-LDFLAGS = @moar::ldflags@ @moar::ldmiscflags@ @moar::ldoptiflags@ @moar::ldlibs@
+M_CC      = @moar::cc@
+M_LD      = @moar::ld@
+M_CFLAGS  = @moar::cflags@ @moar::ccmiscflags@ @moar::ccoptiflags@ @moar::ccwarnflags@
+M_LDFLAGS = @moar::ldflags@ @moar::ldmiscflags@ @moar::ldoptiflags@ @moar::ldlibs@
 
-PERL    = perl
-PROVE   = prove
 M_GEN_CAT = tools/build/gen-cat.pl moar
 
-PREFIX = @prefix@
 MOAR   = $(PREFIX)@slash@bin@slash@moar@exe@
 M_NQP  = $(PREFIX)@slash@bin@slash@nqp-m@runner_suffix@
 M_LIBPATH = $(PREFIX)@slash@languages@slash@nqp@slash@lib
@@ -188,15 +185,15 @@ HARNESS = $(PERL) t/harness
 m-all: $(PERL6_MOAR) $(SETTING_MOAR) $(R_SETTING_MOAR) $(M_RUNNER) lib/Test.moarvm blib/lib.moarvm blib/Pod/To/Text.moarvm
 
 $(M_PERL6_OPS_DLL): $(M_PERL6_OPS_SRC) $(M_PERL6_CONT_SRC) Makefile
-	$(CC) @moar::ccswitch@ @moar::ccshared@ $(CFLAGS) -I$(PREFIX)/include/libatomic_ops \
+	$(M_CC) @moar::ccswitch@ @moar::ccshared@ $(M_CFLAGS) -I$(PREFIX)/include/libatomic_ops \
 	    -I$(PREFIX)/include/dyncall -I$(PREFIX)/include/linenoise -I$(PREFIX)/include/moar \
 	    -I$(PREFIX)/include/sha1 -I$(PREFIX)/include/tinymt  -I$(PREFIX)/include/libtommath \
 	    -I$(PREFIX)/include/libuv -I$(PREFIX)/include @moar::ccout@$(M_PERL6_OPS_OBJ) $(M_PERL6_OPS_SRC)
-	$(CC) @moar::ccswitch@ @moar::ccshared@ $(CFLAGS) -I$(PREFIX)/include/libatomic_ops \
+	$(M_CC) @moar::ccswitch@ @moar::ccshared@ $(M_CFLAGS) -I$(PREFIX)/include/libatomic_ops \
 	    -I$(PREFIX)/include/dyncall -I$(PREFIX)/include/linenoise -I$(PREFIX)/include/moar \
 	    -I$(PREFIX)/include/sha1 -I$(PREFIX)/include/tinymt  -I$(PREFIX)/include/libtommath \
 	    -I$(PREFIX)/include/libuv -I$(PREFIX)/include @moar::ccout@$(M_PERL6_CONT_OBJ) $(M_PERL6_CONT_SRC)
-	$(LD) @moar::ldswitch@ @moar::ldshared@ $(LDFLAGS) @moar::ldout@$(M_PERL6_OPS_DLL) $(M_PERL6_OPS_OBJ) $(M_PERL6_CONT_OBJ) @moarimplib@
+	$(M_LD) @moar::ldswitch@ @moar::ldshared@ $(M_LDFLAGS) @moar::ldout@$(M_PERL6_OPS_DLL) $(M_PERL6_OPS_OBJ) $(M_PERL6_CONT_OBJ) @moarimplib@
 
 $(PERL6_ML_MOAR): src/Perl6/ModuleLoader.nqp src/vm/moar/ModuleLoaderVMConfig.nqp
 	$(PERL) $(M_GEN_CAT) src/vm/moar/ModuleLoaderVMConfig.nqp src/Perl6/ModuleLoader.nqp > src/gen/m-ModuleLoader.nqp

diff --git a/tools/build/Makefile-Parrot.in b/tools/build/Makefile-Parrot.in
@@ -10,12 +10,12 @@ PARROT_LIB_DIR     = @libdir@$(PARROT_VERSION)
 PARROT_SRC_DIR     = @srcdir@$(PARROT_VERSION)
 HAS_ICU            = @has_icu@
 
-CC            = @cc@
-CFLAGS        = @ccflags@ @cc_shared@ @cc_debug@ @ccwarn@ @gc_flag@ @optimize@
-EXE           = @exe@
-LD            = @ld@
-LDFLAGS       = @ldflags@ @ld_debug@
-LD_LOAD_FLAGS = @ld_load_flags@
+P_CC            = @cc@
+P_CFLAGS        = @ccflags@ @cc_shared@ @cc_debug@ @ccwarn@ @gc_flag@ @optimize@
+EXE             = @exe@
+P_LD            = @ld@
+P_LDFLAGS       = @ldflags@ @ld_debug@
+P_LD_LOAD_FLAGS = @ld_load_flags@
 LIBPARROT     = @inst_libparrot_ldflags@
 O             = @o@
 LOAD_EXT      = @load_ext@
@@ -32,7 +32,7 @@ PARROT_TOOLS_DIR = $(PARROT_LIB_DIR)/tools
 PARROT_PERL_LIB  = $(PARROT_TOOLS_DIR)/lib
 OPS2C            = $(PARROT_BIN_DIR)/ops2c$(EXE)
 CINCLUDES        = -I$(PARROT_INCLUDE_DIR) -I$(PARROT_INCLUDE_DIR)/pmc
-LINKARGS         = $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT) @libs@ @icu_shared@
+LINKARGS         = $(P_LDFLAGS) $(P_LD_LOAD_FLAGS) $(LIBPARROT) @libs@ @icu_shared@
 P_GEN_CAT        = tools/build/gen-cat.pl parrot
 P_BUILD_DIR      = gen/parrot
 
@@ -533,12 +533,12 @@ $(DYNEXT_DYNOPS): $(DYNOPS)
 
 $(DYNOPS): $(OPS_DIR)/$(OPS_SOURCE) src/vm/parrot/guts/bind.c src/vm/parrot/guts/bind.h src/vm/parrot/guts/container.c src/vm/parrot/guts/container.h src/vm/parrot/guts/types.c src/vm/parrot/guts/types.h src/vm/parrot/guts/sixmodelobject.h src/vm/parrot/guts/storage_spec.h src/vm/parrot/guts/exceptions.h src/vm/parrot/guts/exceptions.c
 	cd $(OPS_DIR) && $(OPS2C) C --dynamic $(OPS_SOURCE)
-	cd $(OPS_DIR) && $(CC) -c @cc_o_out@$(OPS)$(O) $(CINCLUDES) $(CFLAGS) $(OPS).c
-	cd src/vm/parrot/guts && $(CC) -c @cc_o_out@exceptions$(O) $(CINCLUDES) $(CFLAGS) exceptions.c
-	cd src/vm/parrot/guts && $(CC) -c @cc_o_out@bind$(O) $(CINCLUDES) $(CFLAGS) bind.c
-	cd src/vm/parrot/guts && $(CC) -c @cc_o_out@container$(O) $(CINCLUDES) $(CFLAGS) container.c
-	cd src/vm/parrot/guts && $(CC) -c @cc_o_out@types$(O) $(CINCLUDES) $(CFLAGS) types.c
-	cd $(OPS_DIR) && $(LD) @ld_out@$(OPS)$(LOAD_EXT) $(OPS)$(O) ../guts/bind$(O) ../guts/exceptions$(O) ../guts/container$(O) ../guts/types$(O) $(LINKARGS)
+	cd $(OPS_DIR) && $(P_CC) -c @cc_o_out@$(OPS)$(O) $(CINCLUDES) $(P_CFLAGS) $(OPS).c
+	cd src/vm/parrot/guts && $(P_CC) -c @cc_o_out@exceptions$(O) $(CINCLUDES) $(P_CFLAGS) exceptions.c
+	cd src/vm/parrot/guts && $(P_CC) -c @cc_o_out@bind$(O) $(CINCLUDES) $(P_CFLAGS) bind.c
+	cd src/vm/parrot/guts && $(P_CC) -c @cc_o_out@container$(O) $(CINCLUDES) $(P_CFLAGS) container.c
+	cd src/vm/parrot/guts && $(P_CC) -c @cc_o_out@types$(O) $(CINCLUDES) $(P_CFLAGS) types.c
+	cd $(OPS_DIR) && $(P_LD) @ld_out@$(OPS)$(LOAD_EXT) $(OPS)$(O) ../guts/bind$(O) ../guts/exceptions$(O) ../guts/container$(O) ../guts/types$(O) $(LINKARGS)
 
 # nqp::makefile <-- tells NQP::Configure to treat this file as a makefile,
 #                   performing win32 slash and makefile conversions