Skip to content

Commit ba6378e

Browse files
vrurgvrurg
authored
Merge pull request #587 from vrurg/configure-rebuild-all
Support for the new way of doing silent/verbose builds
2 parents 58996e3 + ac81c66 commit ba6378e

File tree

6 files changed

+66
-57
lines changed

6 files changed

+66
-57
lines changed

‎3rdparty/nqp-configure

‎tools/lib/NQP/Config/NQP.pm

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ sub configure_refine_vars {
7878

7979
sub configure_misc {
8080
my $self = shift;
81+
$self->SUPER::configure_misc(@_);
8182
my $config = $self->{config};
8283

8384
if ( $self->active_backend('moar') ) {
@@ -376,6 +377,13 @@ sub gen_moar {
376377

377378
if ( $try_generate || ( $has_gen_moar && $force_rebuild ) ) {
378379

380+
# Don't expect any particular commit in MoarVM/ if the repo is already
381+
# checked out.
382+
my $expected_spec =
383+
-d File::Spec->catdir( $self->cfg('base_dir'), 'MoarVM', '.git' )
384+
? undef
385+
: $moar_want;
386+
379387
my $moar_repo =
380388
$self->git_checkout( 'moar', 'MoarVM', $gen_moar || $moar_want );
381389

@@ -470,7 +478,7 @@ sub _m_stage_gencat {
470478
return $self->expand(<<TPL);
471479
$text
472480
\t\@echo(+++ Generating\t\$\@)@
473-
\t\@noecho\@\@bpm(\@ucstage\@_GEN_CAT)\@ \@prereqs\@ > \$\@
481+
\t\$(NOECHO)\@bpm(\@ucstage\@_GEN_CAT)\@ \@prereqs\@ > \$\@
474482
TPL
475483
}
476484

@@ -484,7 +492,7 @@ sub _m_stage_precomp {
484492
return $self->expand(<<TPL);
485493
$text
486494
\t\@echo(+++ Compiling\t\$\@)@
487-
\t\@noecho\@\@bpm(STAGE\@prev_stage\@_NQP)\@\@expand(\@setting_path_param\@\@module_path_param\@)\@ --no-regex-lib --target=\@btarget\@ --setting=\@nqp_setting\@ \@bpm(PRECOMP_\@ucstage\@_FLAGS)\@ --output=\$\@ \@prereqs\@
495+
\t\$(NOECHO)\@bpm(STAGE\@prev_stage\@_NQP)\@\@expand(\@setting_path_param\@\@module_path_param\@)\@ --no-regex-lib --target=\@btarget\@ --setting=\@nqp_setting\@ \@bpm(PRECOMP_\@ucstage\@_FLAGS)\@ --output=\$\@ \@prereqs\@
488496
TPL
489497
}
490498

‎tools/templates/Makefile-backend-common.in

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555

5656
@backend_prefix@-dirs::
5757
@echo(+++ Preparing @uc(@backend@)@ build directories)@
58-
@noecho@$(MKPATH)@for_stages( @stage_dir@)@
58+
$(NOECHO)$(MKPATH)@for_stages( @stage_dir@)@
5959

6060
@backend_prefix@-stage0::
6161
@echo(++++++ BUILDING @uc(@backend@)@ BACKEND)@
@@ -120,21 +120,21 @@
120120

121121
@nfp(@stage_dir@/@bsm(NQP)@)@: @prev_stage_dir@ @nfp(@stage_dir@/@bsm(QAST)@)@ @nfp(@stage_dir@/@bsm(P6QREGEX)@)@ @bpm(SOURCES)@
122122
@echo(+++ Creating stage @stage@ NQP)@
123-
@noecho@$(PERL5) @shquot(@script(gen-version.pl)@)@ @q($(PREFIX))@ @q($(NQP_HOME))@ @q($(NQP_LIB_DIR))@ > @nfpq(@stage_dir@/nqp-config.nqp)@
124-
@noecho@@bpm(@ucstage@_GEN_CAT)@ @bpm(NQP_SOURCES)@ @nfpq(@stage_dir@/nqp-config.nqp)@ > @nfpq(@stage_dir@/$(NQP_COMBINED))@
125-
@noecho@@bpm(@ucprev_stage@_NQP)@ --module-path=@shquot(@stage_dir@)@ --setting-path=@shquot(@stage_dir@)@ \
123+
$(NOECHO)$(PERL5) @shquot(@script(gen-version.pl)@)@ @q($(PREFIX))@ @q($(NQP_HOME))@ @q($(NQP_LIB_DIR))@ > @nfpq(@stage_dir@/nqp-config.nqp)@
124+
$(NOECHO@nop())@@bpm(@ucstage@_GEN_CAT)@ @bpm(NQP_SOURCES)@ @nfpq(@stage_dir@/nqp-config.nqp)@ > @nfpq(@stage_dir@/$(NQP_COMBINED))@
125+
$(NOECHO@nop())@@bpm(@ucprev_stage@_NQP)@ --module-path=@shquot(@stage_dir@)@ --setting-path=@shquot(@stage_dir@)@ \
126126
--setting=NQPCORE --target=@btarget@ --no-regex-lib @bpm(PRECOMP_@ucstage@_FLAGS)@ @bpm(NQP_@ucstage@_FLAGS)@ \
127127
--output=@nfpq(@stage_dir@/@bsm(NQP)@)@ @nfpq(@stage_dir@/$(NQP_COMBINED))@
128128
)@
129129

130130
@bsm(NQP)@: @backend_prefix@-stage2 #@bpm(STAGE2_OUTPUT)@
131131
@echo(+++ Installing @uc(@backend@)@ stage 2 files locally)@
132-
@noecho@$(CP) @bpm(STAGE2_OUTPUT)@ .
132+
$(NOECHO)$(CP) @bpm(STAGE2_OUTPUT)@ .
133133

134134
@bsm(P5QREGEX)@: $(P5QREGEX_SOURCES) @bsm(NQP)@ @bpm(BUILD_RUNNER)@
135135
@echo(+++ Compiling $@)@
136-
@noecho@@bpm(GEN_CAT)@ stage2 $(P5QREGEX_SOURCES) > @nfpq(@bpm(STAGE2_DIR)@/$(P5QREGEX_COMBINED))@
137-
@noecho@@bpm(BUILD_RUNNER_BIN)@ --target=@btarget@ --output=@bsm(P5QREGEX)@ \
136+
$(NOECHO@nop())@@bpm(GEN_CAT)@ stage2 $(P5QREGEX_SOURCES) > @nfpq(@bpm(STAGE2_DIR)@/$(P5QREGEX_COMBINED))@
137+
$(NOECHO@nop())@@bpm(BUILD_RUNNER_BIN)@ --target=@btarget@ --output=@bsm(P5QREGEX)@ \
138138
@nfpq(@bpm(STAGE2_DIR)@/$(P5QREGEX_COMBINED))@
139139

140140
@bpv(CLEANUPS)@ = \
@@ -148,22 +148,22 @@
148148

149149
@backend_prefix@-clean::
150150
@echo(+++ Cleaning @uc(@backend@)@ backend)@
151-
@noecho@$(RM_RF) @bpm(CLEANUPS)@ @bpm(CLEANUPS_EXTRA)@
151+
$(NOECHO)$(RM_RF) @bpm(CLEANUPS)@ @bpm(CLEANUPS_EXTRA)@
152152

153153
@backend_prefix@-install-dirs::
154154
@echo(+++ Creating @uc(@backend@)@ installation directories)@
155-
@noecho@$(MKPATH) @q($(DESTDIR)$(BIN_DIR))@
156-
@noecho@$(MKPATH) @q($(DESTDIR)$(NQP_LIB_DIR))@
157-
@noecho@$(MKPATH) @q($(DESTDIR@nop())@@bsm(NQP_LIB_DIR)@)@
155+
$(NOECHO)$(MKPATH) @q($(DESTDIR)$(BIN_DIR))@
156+
$(NOECHO)$(MKPATH) @q($(DESTDIR)$(NQP_LIB_DIR))@
157+
$(NOECHO)$(MKPATH) @q($(DESTDIR@nop())@@bsm(NQP_LIB_DIR)@)@
158158

159159
@backend_prefix@-install:: @backend_prefix@-all @backend_prefix@-install-dirs @@configure_script@@
160160
@echo(+++ Installing into $(DESTDIR)$(PREFIX))@
161-
@noecho@$(CP) @bpm(STAGE2_OUTPUT)@ @q($(DESTDIR)$(NQP_LIB_DIR))@
162-
@noecho@$(CP) @bsm(P5QREGEX)@ @q($(DESTDIR)$(NQP_LIB_DIR))@
161+
$(NOECHO)$(CP) @bpm(STAGE2_OUTPUT)@ @q($(DESTDIR)$(NQP_LIB_DIR))@
162+
$(NOECHO)$(CP) @bsm(P5QREGEX)@ @q($(DESTDIR)$(NQP_LIB_DIR))@
163163

164164
@backend_prefix@-bootstrap-files: @bpm(STAGE2_OUTPUT)@
165165
@echo(+++ BOOTSTRAPPING into @bpm(STAGE0_DIR)@)@
166-
@noecho@$(CP) @bpm(STAGE2_OUTPUT)@ @bpm(STAGE0_DIR)@
166+
$(NOECHO)$(CP) @bpm(STAGE2_OUTPUT)@ @bpm(STAGE0_DIR)@
167167

168168
## testing
169169

‎tools/templates/Makefile-common.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# common definitions used by all backends
22

3+
@NOECHO_declaration@
34
COMMON_HLL_SOURCES = \
45
@nfp(src/HLL/Grammar.nqp)@ \
56
@nfp(src/HLL/Actions.nqp)@ \

‎tools/templates/jvm/Makefile.in

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -54,49 +54,49 @@ THIRDPARTY_JARS = $(ASM)@cpsep@$(ASMTREE)@cpsep@$(JLINE)@cpsep@$(JNA)
5454
@bpm(STAGE0_DIR)@: @bsm(RUNTIME)@
5555

5656
@backend_prefix@-dirs::
57-
@noecho@$(MKPATH) @q(@bpm(RUNNER_JAR_DIR)@)@ @q(@bpm(RUNNER_LIB_DIR)@)@
57+
$(NOECHO)$(MKPATH) @q(@bpm(RUNNER_JAR_DIR)@)@ @q(@bpm(RUNNER_LIB_DIR)@)@
5858

5959
@backend_prefix@-install::
6060
@echo(+++ Installing @uc(@backend@)@ specifics)@
61-
@noecho@$(CP) @q($(ASM))@ @q($(ASMTREE))@ @q($(DESTDIR@nop())@@bsm(NQP_LIB_DIR)@)@
62-
@noecho@$(CP) @q($(JLINE))@ @q($(JNA))@ @q($(DESTDIR@nop())@@bsm(NQP_LIB_DIR)@)@
63-
@noecho@$(CP) @q(@bsm(RUNTIME)@)@ @q($(DESTDIR@nop())@@bsm(NQP_LIB_DIR)@)@
64-
@noecho@$(CP) @q(@bpm(EVAL_CLIENT)@)@ @q($(DESTDIR)$(BIN_DIR))@
65-
@noecho@$(CHMOD) 0755 @nfpq($(DESTDIR)$(BIN_DIR)/eval-client.pl)@
66-
@noecho@$(CONFIGURE) --expand=nqp-j --out=@nfpq($(DESTIR)$(PREFIX)/bin/@bpm(BUILD_RUNNER)@)@ \
61+
$(NOECHO)$(CP) @q($(ASM))@ @q($(ASMTREE))@ @q($(DESTDIR@nop())@@bsm(NQP_LIB_DIR)@)@
62+
$(NOECHO)$(CP) @q($(JLINE))@ @q($(JNA))@ @q($(DESTDIR@nop())@@bsm(NQP_LIB_DIR)@)@
63+
$(NOECHO)$(CP) @q(@bsm(RUNTIME)@)@ @q($(DESTDIR@nop())@@bsm(NQP_LIB_DIR)@)@
64+
$(NOECHO)$(CP) @q(@bpm(EVAL_CLIENT)@)@ @q($(DESTDIR)$(BIN_DIR))@
65+
$(NOECHO)$(CHMOD) 0755 @nfpq($(DESTDIR)$(BIN_DIR)/eval-client.pl)@
66+
$(NOECHO)$(CONFIGURE) --expand=nqp-j --out=@nfpq($(DESTIR)$(PREFIX)/bin/@bpm(BUILD_RUNNER)@)@ \
6767
--set-var=ctx_subdir=@shquot(@backend_subdir@)@ \
6868
--set-var=jar_dir=@q($(DESTIR@nop())@@bsm(NQP_LIB_DIR)@)@ \
6969
--set-var=lib_dir=@q($(DESTIR)$(NQP_LIB_DIR))@ \
7070
--set-var=cur_dir=@q()@
71-
@noecho@$(CHMOD) 755 @nfpq($(DESTIR)$(PREFIX)/bin/@bpm(BUILD_RUNNER)@)@
71+
$(NOECHO)$(CHMOD) 755 @nfpq($(DESTIR)$(PREFIX)/bin/@bpm(BUILD_RUNNER)@)@
7272

7373
@bsm(RUNTIME)@: $(RUNTIME_JAVAS) @mkquot(@script(gen-jvm-properties.pl)@)@
7474
@echo(+++ Preparing Java runtime)@
75-
@noecho@$(MKPATH) bin
76-
@noecho@$(JAVAC) --release 9 -cp @q($(THIRDPARTY_JARS))@ -g -d bin -encoding UTF8 $(RUNTIME_JAVAS)
77-
@noecho@$(PERL5) @shquot(@script(gen-jvm-properties.pl)@)@ . @nfpq($(NQP_HOME))@ @q($(THIRDPARTY_JARS))@ > jvmconfig.properties
78-
@noecho@$(PERL5) @shquot(@script(gen-jvm-properties.pl)@)@ @nfpq(@prefix@)@ @nfpq($(NQP_HOME))@ @q($(THIRDPARTY_JARS))@ > @nfpq(bin/jvmconfig.properties)@
79-
@noecho@$(JAR) cf0 nqp-runtime.jar -C @nfp(bin/)@ .
75+
$(NOECHO)$(MKPATH) bin
76+
$(NOECHO)$(JAVAC) --release 9 -cp @q($(THIRDPARTY_JARS))@ -g -d bin -encoding UTF8 $(RUNTIME_JAVAS)
77+
$(NOECHO)$(PERL5) @shquot(@script(gen-jvm-properties.pl)@)@ . @nfpq($(NQP_HOME))@ @q($(THIRDPARTY_JARS))@ > jvmconfig.properties
78+
$(NOECHO)$(PERL5) @shquot(@script(gen-jvm-properties.pl)@)@ @nfpq(@prefix@)@ @nfpq($(NQP_HOME))@ @q($(THIRDPARTY_JARS))@ > @nfpq(bin/jvmconfig.properties)@
79+
$(NOECHO)$(JAR) cf0 nqp-runtime.jar -C @nfp(bin/)@ .
8080

8181
@bpm(BUILD_RUNNER)@: @mkquot(@configure_script@)@ @@template(nqp-j)@@ @@template(runner-prelude)@@
8282
@echo(+++ Setting up $@)@
83-
@noecho@$(CP) @bpm(RUNNER_JARS)@ @q(@bpm(RUNNER_JAR_DIR)@)@
84-
@noecho@$(CP) @bpm(RUNNER_LIBS)@ @q(@bpm(RUNNER_LIB_DIR)@)@
85-
@noecho@$(CONFIGURE) --expand=nqp-j --out=@nfpq($(BASE_DIR)/@bpm(BUILD_RUNNER)@)@ \
83+
$(NOECHO)$(CP) @bpm(RUNNER_JARS)@ @q(@bpm(RUNNER_JAR_DIR)@)@
84+
$(NOECHO)$(CP) @bpm(RUNNER_LIBS)@ @q(@bpm(RUNNER_LIB_DIR)@)@
85+
$(NOECHO)$(CONFIGURE) --expand=nqp-j --out=@nfpq($(BASE_DIR)/@bpm(BUILD_RUNNER)@)@ \
8686
--set-var=ctx_subdir=@q(@backend_subdir@)@ \
8787
--set-var=jar_dir=@q(@bpm(RUNNER_JAR_DIR)@)@ \
8888
--set-var=lib_dir=@q(@bpm(RUNNER_LIB_DIR)@)@ \
8989
--set-var=cur_dir=@q(.:)@
90-
@noecho@$(CHMOD) 755 @q(@bpm(BUILD_RUNNER)@)@
90+
$(NOECHO)$(CHMOD) 755 @q(@bpm(BUILD_RUNNER)@)@
9191

9292
@backend_prefix@-runner-default: @backend_prefix@-all
9393
@echo(+++ Setting up default runner)@
94-
@noecho@$(CP) @q(@bpm(BUILD_RUNNER)@)@ @bpm(NQP)@
95-
@noecho@$(CHMOD) 755 @bpm(NQP)@
94+
$(NOECHO)$(CP) @q(@bpm(BUILD_RUNNER)@)@ @bpm(NQP)@
95+
$(NOECHO)$(CHMOD) 755 @bpm(NQP)@
9696

9797
@backend_prefix@-runner-default-install: @backend_prefix@-runner-default @backend_prefix@-install
9898
@echo(+++ Installing default runner)@
99-
@noecho@$(CP) @nfpq($(DESTDIR)$(BIN_DIR)/@bpm(BUILD_RUNNER)@)@ @nfpq($(DESTDIR)$(BIN_DIR)/@bpm(NQP)@)@
100-
@noecho@$(CHMOD) 755 @nfpq($(DESTDIR)$(BIN_DIR)/@bpm(NQP)@)@
99+
$(NOECHO)$(CP) @nfpq($(DESTDIR)$(BIN_DIR)/@bpm(BUILD_RUNNER)@)@ @nfpq($(DESTDIR)$(BIN_DIR)/@bpm(NQP)@)@
100+
$(NOECHO)$(CHMOD) 755 @nfpq($(DESTDIR)$(BIN_DIR)/@bpm(NQP)@)@
101101

102102
# vim: ft=make noexpandtab ts=4 sw=4

‎tools/templates/moar/Makefile.in

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@
3838
@backend_prefix@-all:: @bpm(INST_NQP_M)@ @bpm(INST_NQP)@
3939

4040
@backend_prefix@-install-dirs::
41-
@noecho@$(MKPATH) @nfpq($(DESTDIR)$(NQP_LIB_DIR)/profiler)@
41+
$(NOECHO)$(MKPATH) @nfpq($(DESTDIR)$(NQP_LIB_DIR)/profiler)@
4242

4343
@backend_prefix@-install::
4444
@echo(+++ Installing @uc(@backend@)@ specifics)@
45-
@noecho@$(CP) @bsm(ASTOPS)@ @q($(DESTDIR)$(NQP_LIB_DIR))@
46-
@noecho@$(CP) @nfp(src/vm/moar/profiler/template.html)@ @nfpq($(DESTDIR)$(NQP_LIB_DIR)/profiler/template.html)@
47-
@noecho@$(CP) @bpm(INST_NQP_M)@ @nfpq($(DESTDIR)$(BIN_DIR)/@bpm(NQP_M)@)@
45+
$(NOECHO)$(CP) @bsm(ASTOPS)@ @q($(DESTDIR)$(NQP_LIB_DIR))@
46+
$(NOECHO)$(CP) @nfp(src/vm/moar/profiler/template.html)@ @nfpq($(DESTDIR)$(NQP_LIB_DIR)/profiler/template.html)@
47+
$(NOECHO)$(CP) @bpm(INST_NQP_M)@ @nfpq($(DESTDIR)$(BIN_DIR)/@bpm(NQP_M)@)@
4848
@expand(@m_install@)@
4949

5050
# FIXME:
@@ -68,42 +68,42 @@
6868

6969
@bpm(INST_NQP)@: @nfp(src/vm/moar/runner/main.c)@
7070
@echo(+++ Compiling $@)@
71-
@noecho@$(RM_F) $@
71+
$(NOECHO)$(RM_F) $@
7272
# Using only the pkgconfig moar includes does not work, because moar.h assumes all the specific includes below.
73-
@noecho@@bpm(CC_INST_NQP)@ @if(relocatable -DSTATIC_EXEC_PATH=@q(@c_escape(@nfp(@prefix@/bin/@bpm(NQP)@)@)@)@)@ @moar::ccout@inst-nqp@moar::obj@ @nfp(src/vm/moar/runner/main.c)@
74-
@noecho@@bpm(LD_INST_NQP)@ @moar::ldout@$@ inst-nqp@moar::obj@ @bpm(LD_INST_NQP_POST)@
73+
$(NOECHO)@bpm(CC_INST_NQP)@ @if(relocatable -DSTATIC_EXEC_PATH=@q(@c_escape(@nfp(@prefix@/bin/@bpm(NQP)@)@)@)@)@ @moar::ccout@inst-nqp@moar::obj@ @nfp(src/vm/moar/runner/main.c)@
74+
$(NOECHO)@bpm(LD_INST_NQP)@ @moar::ldout@$@ inst-nqp@moar::obj@ @bpm(LD_INST_NQP_POST)@
7575

7676
@bpm(INST_NQP_M)@: @nfp(src/vm/moar/runner/main.c)@
7777
@echo(+++ Compiling $@)@
78-
@noecho@$(RM_F) $@
78+
$(NOECHO)$(RM_F) $@
7979
# Using only the pkgconfig moar includes does not work, because moar.h assumes all the specific includes below.
80-
@noecho@@bpm(CC_INST_NQP)@ @if(relocatable -DSTATIC_EXEC_PATH=@q(@c_escape(@nfp(@prefix@/bin/@bpm(NQP_M)@)@)@)@)@ @moar::ccout@inst-nqp-m@moar::obj@ @nfp(src/vm/moar/runner/main.c)@
81-
@noecho@@bpm(LD_INST_NQP)@ @moar::ldout@$@ inst-nqp-m@moar::obj@ @bpm(LD_INST_NQP_POST)@
80+
$(NOECHO)@bpm(CC_INST_NQP)@ @if(relocatable -DSTATIC_EXEC_PATH=@q(@c_escape(@nfp(@prefix@/bin/@bpm(NQP_M)@)@)@)@)@ @moar::ccout@inst-nqp-m@moar::obj@ @nfp(src/vm/moar/runner/main.c)@
81+
$(NOECHO)@bpm(LD_INST_NQP)@ @moar::ldout@$@ inst-nqp-m@moar::obj@ @bpm(LD_INST_NQP_POST)@
8282

8383
@bpm(BUILD_RUNNER)@: @@configure_script@@ @@template(@platform@/nqp-m-build.c)@@
8484
@echo(+++ Setting up $@)@
85-
@noecho@$(RM_F) @q(@bpm(BUILD_RUNNER)@)@
86-
@noecho@$(CONFIGURE) --expand @@template(@platform@/nqp-m-build.c)@@ --out nqp-m.c \
85+
$(NOECHO)$(RM_F) @q(@bpm(BUILD_RUNNER)@)@
86+
$(NOECHO)$(CONFIGURE) --expand @@template(@platform@/nqp-m-build.c)@@ --out nqp-m.c \
8787
--set-var=MOAR=@shquot(@nfp(@moar@)@)@ \
8888
--set-var=base_dir=@shquot(@nfp($(BASE_DIR))@)@ \
8989
--set-var=exec_name=@shquot(@nfp($(BASE_DIR)/@bpm(BUILD_RUNNER)@)@)@ \
9090
--set-var=mbc=@bsm(NQP)@
91-
@noecho@@bpm(CC_BUILD_RUNNER)@ @moar::ccout@nqp-m@moar::obj@ nqp-m.c
92-
@noecho@@bpm(LD_BUILD_RUNNER)@ @moar::ldout@$@ nqp-m@moar::obj@
91+
$(NOECHO)@bpm(CC_BUILD_RUNNER)@ @moar::ccout@nqp-m@moar::obj@ nqp-m.c
92+
$(NOECHO)@bpm(LD_BUILD_RUNNER)@ @moar::ldout@$@ nqp-m@moar::obj@
9393

9494
@backend_prefix@-runner-default: @backend_prefix@-all @@configure_script@@ @@template(@platform@/nqp-m-build.c)@@
9595
@echo(+++ Compiling @uc(@backend@)@ default runner)@
96-
@noecho@$(RM_F) @q(@bpm(NQP)@)@
97-
@noecho@$(CONFIGURE) --expand @@template(@platform@/nqp-m-build.c)@@ --out nqp.c \
96+
$(NOECHO)$(RM_F) @q(@bpm(NQP)@)@
97+
$(NOECHO)$(CONFIGURE) --expand @@template(@platform@/nqp-m-build.c)@@ --out nqp.c \
9898
--set-var=MOAR=@shquot(@nfp(@moar@)@)@ \
9999
--set-var=base_dir=@shquot(@nfp($(BASE_DIR))@)@ \
100100
--set-var=exec_name=@shquot(@nfp($(BASE_DIR)/@bpm(NQP)@)@)@ \
101101
--set-var=mbc=@bsm(NQP)@
102-
@noecho@@bpm(CC_BUILD_RUNNER)@ @moar::ccout@nqp@moar::obj@ nqp.c
103-
@noecho@@bpm(LD_BUILD_RUNNER)@ @moar::ldout@@bpm(NQP)@ nqp-m@moar::obj@
102+
$(NOECHO)@bpm(CC_BUILD_RUNNER)@ @moar::ccout@nqp@moar::obj@ nqp.c
103+
$(NOECHO)@bpm(LD_BUILD_RUNNER)@ @moar::ldout@@bpm(NQP)@ nqp-m@moar::obj@
104104

105105
@backend_prefix@-runner-default-install: @backend_prefix@-runner-default @backend_prefix@-install
106106
@echo(+++ Installing default runner)@
107-
@noecho@$(CP) @bpm(INST_NQP)@ @nfpq($(DESTDIR)$(BIN_DIR)/@bpm(NQP)@)@
107+
$(NOECHO)$(CP) @bpm(INST_NQP)@ @nfpq($(DESTDIR)$(BIN_DIR)/@bpm(NQP)@)@
108108

109109
# vim: ft=make noexpandtab ts=4 sw=4

0 commit comments

Comments
 (0)