Skip to content

Commit 3eab863

Browse files
authored
flambda-backend: Fix incorrect use of AC_ARG_ENABLE (#2419)
1 parent e90c817 commit 3eab863

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

Makefile.config.in

+1-5
Original file line numberDiff line numberDiff line change
@@ -245,11 +245,7 @@ POLL_INSERTION=@poll_insertion@
245245
DUNE=@dune@
246246

247247
# Selection of OCaml 4.x or 5.x runtime
248-
ifeq "@enable_runtime5@" "yes"
249-
RUNTIME_SUFFIX=
250-
else
251-
RUNTIME_SUFFIX=4
252-
endif
248+
RUNTIME_SUFFIX=@runtime_suffix@
253249
RUNTIME_DIR=runtime$(RUNTIME_SUFFIX)
254250

255251
# Deprecated variables

configure

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configure.ac

+4
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,14 @@ AC_CONFIG_AUX_DIR([build-aux])
9393
AC_ARG_ENABLE([runtime5],
9494
[AS_HELP_STRING([--enable-runtime5],
9595
[Use the OCaml 5 runtime])])
96+
AS_IF([test x"$enable_runtime5" = xyes],
97+
[runtime_suffix=],
98+
[runtime_suffix=4])
9699

97100
## Output variables
98101

99102
AC_SUBST([enable_runtime5])
103+
AC_SUBST([runtime_suffix])
100104
AC_SUBST([CONFIGURE_ARGS])
101105
AC_SUBST([native_compiler])
102106
AC_SUBST([default_build_target])

0 commit comments

Comments
 (0)