Use make pre-processor ifndef instead of ?=

NMAKE doesn't support ?= assignment
rakudo · Sep 6, 2019 · 88f945c · 88f945c
1 parent 732172b
commit 88f945c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/tools/templates/Makefile-backend-common.in b/tools/templates/Makefile-backend-common.in
@@ -4,11 +4,17 @@
 @bpv(GEN_CAT)@ = @shquot(@script(gen-cat.nqp)@)@ @backend@
 
 @bpv(BUILD_DIR)@ = @nfp(gen/@backend@)@
-@bpv(BLIB_DIR)@ ?= @nfp(blib/Perl6)@
+@make_pp_pfx@ifndef @bpv(BLIB_DIR)@
+@bpv(BLIB_DIR)@ = @nfp(blib/Perl6)@
+@make_pp_pfx@endif
 @bpv(NQP_LIBDIR)@ = @nqp::libdir@
 @bpv(SET_NQP_LIB)@ = @set_nqp_lib@
-@bpv(NQP_RR)@ ?= @bpm(NQP)@
-@bpv(NQP_FLAGS)@ ?= --module-path=blib
+@make_pp_pfx@ifndef @bpv(NQP_RR)@
+@bpv(NQP_RR)@ = @bpm(NQP)@
+@make_pp_pfx@endif
+@make_pp_pfx@ifndef @bpv(NQP_FLAGS)@
+@bpv(NQP_FLAGS)@ = --module-path=blib
+@make_pp_pfx@endif
 @bpv(LIBDIR)@ = @nfp($(PERL6_HOME)/lib)@
 
 # files we create

diff --git a/tools/templates/moar/Makefile.in b/tools/templates/moar/Makefile.in
@@ -77,7 +77,7 @@ R_SETTING_MOAR = RESTRICTED.setting.moarvm
 
 @bpv(NQP_FLAGS_EXTRA)@ = --vmlibs=@bpm(PERL6_OPS_DLL)@=Rakudo_ops_init
 
-@bpv(HARNESS_TYPE)@ := $(HARNESS_TYPE)
+@bpv(HARNESS_TYPE)@ = $(HARNESS_TYPE)
 
 @bpv(HARNESS6)@ = @nfp(./@bpm(RUNNER)@)@ -Ilib @nfp(t/harness6)@
 @bpv(HARNESS6_WITH_FUDGE)@ = @bpm(HARNESS6)@ --fudge