From e4f3aa8c8190d6383cffd4123c43d254fda27f9d Mon Sep 17 00:00:00 2001 From: David Allsopp Date: Fri, 20 Mar 2020 09:38:33 +0000 Subject: [PATCH] Don't assume . in AWKPATH Ensure all script invocations explicitly refer to a directory. --- Changes | 3 +++ runtime/Makefile | 4 ++-- stdlib/Compflags | 2 +- stdlib/Makefile | 2 +- testsuite/Makefile | 4 ++-- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Changes b/Changes index 6a214a2b1..a81a8a3e2 100644 --- a/Changes +++ b/Changes @@ -248,6 +248,9 @@ Working version non-development builds. (David Allsopp, review by Sébastien Hinderer) +- #9383: Don't assume that AWKPATH includes . + (David Allsopp, report by Ian Zimmerman) + ### Bug fixes: - #7683, #1499: Fixes one case where the evaluation order in native-code diff --git a/runtime/Makefile b/runtime/Makefile index b7d20e67f..b69a5e216 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -359,10 +359,10 @@ $(foreach object_type,$(subst %,,$(object_types)), \ $(ASPP) $(ASPPFLAGS) $(SHAREDLIB_CFLAGS) -o $@ $< domain_state64.inc: caml/domain_state.tbl gen_domain_state64_inc.awk - $(AWK) -f gen_domain_state64_inc.awk $< > $@ + $(AWK) -f ./gen_domain_state64_inc.awk $< > $@ domain_state32.inc: caml/domain_state.tbl gen_domain_state32_inc.awk - $(AWK) -f gen_domain_state32_inc.awk $< > $@ + $(AWK) -f ./gen_domain_state32_inc.awk $< > $@ amd64nt.obj: amd64nt.asm domain_state64.inc $(ASM)$@ $(ASMFLAGS) $< diff --git a/stdlib/Compflags b/stdlib/Compflags index 8aa243982..e2262d3cb 100755 --- a/stdlib/Compflags +++ b/stdlib/Compflags @@ -17,7 +17,7 @@ case $1 in stdlib.cm[iox]) echo ' -nopervasives -no-alias-deps -w -49' \ - ' -pp "$AWK -f expand_module_aliases.awk"';; + ' -pp "$AWK -f ./expand_module_aliases.awk"';; camlinternalOO.cmx) echo ' -inline 0 -afl-inst-ratio 0';; camlinternalLazy.cmx) echo ' -afl-inst-ratio 0';; # never instrument camlinternalOO or camlinternalLazy (PR#7725) diff --git a/stdlib/Makefile b/stdlib/Makefile index 6d609bc91..3cef27840 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -258,7 +258,7 @@ SPACE := $(EMPTY) $(EMPTY) depend: $(CAMLDEP) $(DEPFLAGS) $(filter-out stdlib.%,$(wildcard *.mli *.ml)) \ > .depend.tmp - $(CAMLDEP) $(DEPFLAGS) -pp "$(AWK) -f remove_module_aliases.awk" \ + $(CAMLDEP) $(DEPFLAGS) -pp "$(AWK) -f ./remove_module_aliases.awk" \ stdlib.ml stdlib.mli >> .depend.tmp sed -Ee \ 's#(^| )(${subst ${SPACE},|,${UNPREFIXED_OBJS}})[.]#\1stdlib__\2.#g' \ diff --git a/testsuite/Makefile b/testsuite/Makefile index e648e5cab..9d7d6dc72 100644 --- a/testsuite/Makefile +++ b/testsuite/Makefile @@ -259,7 +259,7 @@ clean: .PHONY: report report: @if [ ! -f $(TESTLOG) ]; then echo "No $(TESTLOG) file."; exit 1; fi - @$(AWK) -f summarize.awk < $(TESTLOG) + @$(AWK) -f ./summarize.awk < $(TESTLOG) .PHONY: retry-list retry-list: @@ -275,7 +275,7 @@ retry-list: .PHONY: retries retries: @$(AWK) -v retries=1 -v max_retries=$(MAX_TESTSUITE_DIR_RETRIES) \ - -f summarize.awk < $(TESTLOG) > _retries + -f ./summarize.awk < $(TESTLOG) > _retries @test `cat _retries | wc -l` -eq 0 || $(MAKE) $(NO_PRINT) retry-list @rm -f _retries