From 01a1744bc23582b6490c1a7b2b5e00a7ececf8f3 Mon Sep 17 00:00:00 2001
From: Zoltan Somogyi <zoltan.somogyi@runbox.com>
Date: Sun, 29 Mar 2020 14:01:54 +1100
Subject: [PATCH] Remove a workaround.

---
 compiler/make.util.m | 4 +---
 configure.ac         | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/compiler/make.util.m b/compiler/make.util.m
index af871ad0e..d5d4ad718 100644
--- a/compiler/make.util.m
+++ b/compiler/make.util.m
@@ -526,9 +526,7 @@ make_dependency_list(ModuleNames, TargetType) =
         ModuleNames).
 
 target_extension(Globals, Target) = MaybeExt :-
-    % XXX This line is commented out until compilers that
-    % know about the no_solution_disjunct warning are installed.
-    % disable_warning [no_solution_disjunct]
+    disable_warning [no_solution_disjunct]
     (
         Target = module_target_source,
         MaybeExt = yes(".m")
diff --git a/configure.ac b/configure.ac
index 67919001b..076bca17b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -582,6 +582,7 @@ EOF
             --warn-insts-without-matching-type \
             --warn-known-bad-format-calls \
             --obsolete-proc-2019-10-23 \
+            --github-85--2020-03-24 \
             --no-detect-libgrades \
             --output-grade-string \
             --shlib-linker-install-name-flag "-dummy_flag" \