Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9383 from dra27/explicit-awk 

Don't assume . in AWKPATH
master
David Allsopp 2020-03-20 13:05:44 +00:00 committed by GitHub
parent 8e23a03449 e4f3aa8c81
commit d4ace8c347
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changes
View File

@ -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

4
runtime/Makefile
View File

@ -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) $<

2
stdlib/Compflags
View File

@ -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)

2
stdlib/Makefile
View File

@ -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' \

6
testsuite/Makefile
View File

@ -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:
@ -274,8 +274,8 @@ retry-list:
.PHONY: retries
retries:
@awk -v retries=1 -v max_retries=$(MAX_TESTSUITE_DIR_RETRIES) \
-f summarize.awk < $(TESTLOG) > _retries
@$(AWK) -v retries=1 -v max_retries=$(MAX_TESTSUITE_DIR_RETRIES) \
-f ./summarize.awk < $(TESTLOG) > _retries
@test `cat _retries | wc -l` -eq 0 || $(MAKE) $(NO_PRINT) retry-list
@rm -f _retries