diff options
| author | David Allsopp <david.allsopp@metastack.com> | 2022-05-10 21:04:49 +0100 |
|---|---|---|
| committer | David Allsopp <david.allsopp@metastack.com> | 2022-05-12 15:41:06 +0100 |
| commit | 60cabee184c342b0999c213b3c879f53485bf5f7 (patch) | |
| tree | ac7ff0c49bbea02bca86fe7a5c225029845b23f3 /ocamltest | |
| parent | e295ad418b943bb2b45ff4a0a5237fda2a790cf8 (diff) | |
| download | ocaml-60cabee184c342b0999c213b3c879f53485bf5f7.tar.gz | |
Eliminate $(BOOT_FLEXLINK_CMD)
Diffstat (limited to 'ocamltest')
| -rw-r--r-- | ocamltest/Makefile | 6 | ||||
| -rw-r--r-- | ocamltest/ocamltest_config.ml.in | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ocamltest/Makefile b/ocamltest/Makefile index 6dcc5b73e5..1f8abec508 100644 --- a/ocamltest/Makefile +++ b/ocamltest/Makefile @@ -69,7 +69,6 @@ else CSC := CSCFLAGS := endif -mkexe := $(MKEXE) ifeq "$(TOOLCHAIN)" "msvc" CPP := $(CPP) 2> nul @@ -236,6 +235,9 @@ ocamltest_unix.ml: ocamltest_unix_$(ocamltest_unix).ml echo '# 1 "$^"' > $@ cat $^ >> $@ +# This value should stay the same, regardless of bootstrapping, to cause +# MKEXE, MKDLL and MKMAINDLL to be written correctly. +ocamltest_config.ml: FLEXLINK_CMD=flexlink ocamltest_config.ml: ocamltest_config.ml.in Makefile ../Makefile.config sed $(call SUBST,AFL_INSTRUMENT) \ $(call SUBST,INSTRUMENTED_RUNTIME) \ @@ -262,7 +264,7 @@ ocamltest_config.ml: ocamltest_config.ml.in Makefile ../Makefile.config $(call SUBST_STRING,CSCFLAGS) \ $(call SUBST_STRING,EXE) \ $(call SUBST_STRING,MKDLL) \ - $(call SUBST_STRING,mkexe) \ + $(call SUBST_STRING,MKEXE) \ $(call SUBST_STRING,BYTECCLIBS) \ $(call SUBST_STRING,NATIVECCLIBS) \ $(call SUBST_STRING,ASM) \ diff --git a/ocamltest/ocamltest_config.ml.in b/ocamltest/ocamltest_config.ml.in index 399d3c3cef..8dc96c88d3 100644 --- a/ocamltest/ocamltest_config.ml.in +++ b/ocamltest/ocamltest_config.ml.in @@ -76,7 +76,7 @@ let csc_flags = "%%CSCFLAGS%%" let exe = "%%EXE%%" let mkdll = "%%MKDLL%%" -let mkexe = "%%mkexe%%" +let mkexe = "%%MKEXE%%" let bytecc_libs = "%%BYTECCLIBS%%" |