[m-rev.] diff: Delete erlang options from Mercury.config files.
Peter Wang
novalazy at gmail.com
Mon Jun 7 17:00:07 AEST 2021
scripts/Mercury.config.bootstrap.in:
scripts/Mercury.config.in:
Delete Erlang related environment variables and options.
diff --git a/scripts/Mercury.config.bootstrap.in b/scripts/Mercury.config.bootstrap.in
index 3a36dd1f9..69d78882a 100644
--- a/scripts/Mercury.config.bootstrap.in
+++ b/scripts/Mercury.config.bootstrap.in
@@ -35,8 +35,6 @@ MERCURY_JAVA_INTERPRETER=@JAVA_INTERPRETER@
MERCURY_CSHARP_COMPILER=@CSC@
MERCURY_CSHARP_COMPILER_TYPE=@CSHARP_COMPILER_TYPE@
MERCURY_CLI_INTERPRETER=@CLI_INTERPRETER@
-MERCURY_ERLANG_COMPILER=
-MERCURY_ERLANG_INTERPRETER=
MERCURY_TARGET_ARCH=@FULLARCH@
# $(MATH_LIB) needs to be defined because it may
# be used by the substitution for SHARED_LIBS.
@@ -64,8 +62,6 @@ DEFAULT_MCFLAGS=\
--csharp-compiler "$(MERCURY_CSHARP_COMPILER)" \
--csharp-compiler-type "$(MERCURY_CSHARP_COMPILER_TYPE)" \
--cli-interpreter "$(MERCURY_CLI_INTERPRETER)" \
- --erlang-compiler "$(MERCURY_ERLANG_COMPILER)" \
- --erlang-interpreter "$(MERCURY_ERLANG_INTERPRETER)" \
--grade "$(MERCURY_DEFAULT_GRADE)" \
--cflags-for-ansi "@CFLAGS_FOR_ANSI@" \
--cflags-for-optimization "@CFLAGS_FOR_OPT@" \
diff --git a/scripts/Mercury.config.in b/scripts/Mercury.config.in
index 36ff98b24..adeaf23f9 100644
--- a/scripts/Mercury.config.in
+++ b/scripts/Mercury.config.in
@@ -34,8 +34,6 @@ MERCURY_JAVA_INTERPRETER=@JAVA_INTERPRETER@
MERCURY_CSHARP_COMPILER=@CSC@
MERCURY_CSHARP_COMPILER_TYPE=@CSHARP_COMPILER_TYPE@
MERCURY_CLI_INTERPRETER=@CLI_INTERPRETER@
-MERCURY_ERLANG_COMPILER=
-MERCURY_ERLANG_INTERPRETER=
MERCURY_TARGET_ARCH=@FULLARCH@
# $(MATH_LIB) needs to be defined because it may
# be used by the substitution for SHARED_LIBS.
@@ -60,8 +58,6 @@ DEFAULT_MCFLAGS=\
--csharp-compiler "$(MERCURY_CSHARP_COMPILER)" \
--csharp-compiler-type "$(MERCURY_CSHARP_COMPILER_TYPE)" \
--cli-interpreter "$(MERCURY_CLI_INTERPRETER)" \
- --erlang-compiler "$(MERCURY_ERLANG_COMPILER)" \
- --erlang-interpreter "$(MERCURY_ERLANG_INTERPRETER)" \
--cflags-for-ansi "@CFLAGS_FOR_ANSI@" \
--cflags-for-optimization "@CFLAGS_FOR_OPT@" \
--cflags-for-warnings "@CFLAGS_FOR_WARNINGS@" \
--
2.31.1
More information about the reviews
mailing list