Don't assume . in AWKPATH
Ensure all script invocations explicitly refer to a directory.master
parent
bc867cebf8
commit
e4f3aa8c81
3
Changes
3
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
|
||||
|
|
|
@ -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) $<
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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' \
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue