diff options
| author | David Allsopp <david.allsopp@metastack.com> | 2020-03-20 13:05:44 +0000 |
|---|---|---|
| committer | David Allsopp <david.allsopp@metastack.com> | 2020-03-20 13:19:24 +0000 |
| commit | a8271945129217f3cdfca269a9a024536c008714 (patch) | |
| tree | ea785e97856dd4d65dd32bc6f76a9dd0a568156b | |
| parent | 849bf6239dd0f9dae45b945c92e24f41d27fd3ad (diff) | |
| download | ocaml-a8271945129217f3cdfca269a9a024536c008714.tar.gz | |
Merge pull request #9383 from dra27/explicit-awk
Don't assume . in AWKPATH
(cherry picked from commit d4ace8c347a9a4f8baa8f0b1738a5b4436fcd027)
| -rw-r--r-- | Changes | 3 | ||||
| -rwxr-xr-x | stdlib/Compflags | 2 | ||||
| -rw-r--r-- | stdlib/Makefile | 2 | ||||
| -rw-r--r-- | testsuite/Makefile | 4 |
4 files changed, 7 insertions, 4 deletions
@@ -6,6 +6,9 @@ OCaml 4.08 maintenance branch: ocamldep link not created) (David Allsopp, report by Thomas Leonard) +- #9383: Don't assume that AWKPATH includes . + (David Allsopp, report by Ian Zimmerman) + OCaml 4.08.1 (5 August 2019) ---------------------------- diff --git a/stdlib/Compflags b/stdlib/Compflags index 0f3138cd8f..ad75da1679 100755 --- a/stdlib/Compflags +++ b/stdlib/Compflags @@ -17,7 +17,7 @@ case $1 in stdlib.cm[iox]|stdlib.p.cmx) echo ' -nopervasives -no-alias-deps -w -49' \ - ' -pp "$AWK -f expand_module_aliases.awk"';; + ' -pp "$AWK -f ./expand_module_aliases.awk"';; camlinternalOO.cmx|camlinternalOO.p.cmx) echo ' -inline 0 -afl-inst-ratio 0';; camlinternalLazy.cmx|camlinternalLazy.p.cmx) echo ' -afl-inst-ratio 0';; # never instrument camlinternalOO or camlinternalLazy (PR#7725) diff --git a/stdlib/Makefile b/stdlib/Makefile index 67dc8bc478..f158592f9f 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -307,7 +307,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 $(CAMLDEP) $(DEPFLAGS) $(filter-out stdlib.%,$(wildcard *.ml)) \ | sed -e 's/\.cmx : /.p.cmx : /g' >>.depend.tmp diff --git a/testsuite/Makefile b/testsuite/Makefile index b383ec2308..8263232e99 100644 --- a/testsuite/Makefile +++ b/testsuite/Makefile @@ -287,7 +287,7 @@ clean: .PHONY: report report: @if [ ! -f $(TESTLOG) ]; then echo "No $(TESTLOG) file."; exit 1; fi - @awk -f makefiles/summarize.awk < $(TESTLOG) + @$(AWK) -f makefiles/summarize.awk < $(TESTLOG) .PHONY: retry-list retry-list: @@ -302,7 +302,7 @@ retry-list: .PHONY: retries retries: - @awk -v retries=1 -v max_retries=$(MAX_TESTSUITE_DIR_RETRIES) \ + @$(AWK) -v retries=1 -v max_retries=$(MAX_TESTSUITE_DIR_RETRIES) \ -f makefiles/summarize.awk < $(TESTLOG) > _retries @test `cat _retries | wc -l` -eq 0 || $(MAKE) $(NO_PRINT) retry-list @rm -f _retries |