From 6e5a0144ae445a4785ba087fbf406854de783c7d Mon Sep 17 00:00:00 2001 From: Julien Fischer Date: Tue, 10 Sep 2013 17:31:06 +1000 Subject: [PATCH] Disable library grade detection when building Mercury itself. Library grade detection causes the library installation for the csharp grade (and probably any grades that use mmc --make) to fail. (There is likely a better solution than this, e.g. making --no-mercury-stdlib-dir imply --no-detect-libgrades, but the handling of command line options in this part of the compiler is pretty convoluted, so I will look into that separately.) browser/MDB_FLAGS.in: compiler/COMP_FLAGS.in: deep_profiler/DEEP_FLAGS.in: library/LIB_FLAGS.in: mdbcomp/MDBCOMP_FLAGS.in: mfilterjavac/MFILTERJAVAC_FLAGS.in: profiler/PROF_FLAGS.in: slice/SLICE_FLAGS.in: ssdb/SSDB_FLAGS.in: As above. --- browser/MDB_FLAGS.in | 1 + compiler/COMP_FLAGS.in | 1 + deep_profiler/DEEP_FLAGS.in | 1 + library/LIB_FLAGS.in | 1 + mdbcomp/MDBCOMP_FLAGS.in | 1 + mfilterjavac/MFILTERJAVAC_FLAGS.in | 1 + profiler/PROF_FLAGS.in | 1 + slice/SLICE_FLAGS.in | 1 + ssdb/SSDB_FLAGS.in | 1 + 9 files changed, 9 insertions(+) diff --git a/browser/MDB_FLAGS.in b/browser/MDB_FLAGS.in index 8a593d7fb..919fcf553 100644 --- a/browser/MDB_FLAGS.in +++ b/browser/MDB_FLAGS.in @@ -3,6 +3,7 @@ --halt-at-warn --no-warn-inferred-erroneous --no-mercury-stdlib-dir +--no-detect-libgrades --no-shlib-linker-use-install-name --force-disable-tracing --force-disable-ssdebug diff --git a/compiler/COMP_FLAGS.in b/compiler/COMP_FLAGS.in index 7176b64d8..2bd9fc1a7 100644 --- a/compiler/COMP_FLAGS.in +++ b/compiler/COMP_FLAGS.in @@ -3,6 +3,7 @@ --halt-at-warn --no-warn-inferred-erroneous --no-mercury-stdlib-dir +--no-detect-libgrades -I../library -I../browser -I../ssdb diff --git a/deep_profiler/DEEP_FLAGS.in b/deep_profiler/DEEP_FLAGS.in index d73d03aff..1d507f6d4 100644 --- a/deep_profiler/DEEP_FLAGS.in +++ b/deep_profiler/DEEP_FLAGS.in @@ -3,6 +3,7 @@ --halt-at-warn --no-warn-inferred-erroneous --no-mercury-stdlib-dir +--no-detect-libgrades -I../library -I../browser -I../ssdb diff --git a/library/LIB_FLAGS.in b/library/LIB_FLAGS.in index 9eb6e4532..4d199d7b6 100644 --- a/library/LIB_FLAGS.in +++ b/library/LIB_FLAGS.in @@ -5,6 +5,7 @@ --halt-at-warn --no-warn-inferred-erroneous --no-mercury-stdlib-dir +--no-detect-libgrades --strict-sequential --generate-mmc-deps --no-shlib-linker-use-install-name diff --git a/mdbcomp/MDBCOMP_FLAGS.in b/mdbcomp/MDBCOMP_FLAGS.in index 7c88bdba0..0595c76f4 100644 --- a/mdbcomp/MDBCOMP_FLAGS.in +++ b/mdbcomp/MDBCOMP_FLAGS.in @@ -3,6 +3,7 @@ --halt-at-warn --no-warn-inferred-erroneous --no-mercury-stdlib-dir +--no-detect-libgrades --generate-mmc-deps --force-disable-ssdebug --no-libgrade diff --git a/mfilterjavac/MFILTERJAVAC_FLAGS.in b/mfilterjavac/MFILTERJAVAC_FLAGS.in index 5aa3b4adb..462cb539a 100644 --- a/mfilterjavac/MFILTERJAVAC_FLAGS.in +++ b/mfilterjavac/MFILTERJAVAC_FLAGS.in @@ -3,6 +3,7 @@ --halt-at-warn --no-warn-inferred-erroneous --no-mercury-stdlib-dir +--no-detect-libgrades -I../library -I../browser -I../ssdb diff --git a/profiler/PROF_FLAGS.in b/profiler/PROF_FLAGS.in index 39bd94389..977296013 100644 --- a/profiler/PROF_FLAGS.in +++ b/profiler/PROF_FLAGS.in @@ -3,6 +3,7 @@ --halt-at-warn --no-warn-inferred-erroneous --no-mercury-stdlib-dir +--no-detect-libgrades -I../library -I../browser -I../mdbcomp diff --git a/slice/SLICE_FLAGS.in b/slice/SLICE_FLAGS.in index 2a4321c5e..d6e5c7873 100644 --- a/slice/SLICE_FLAGS.in +++ b/slice/SLICE_FLAGS.in @@ -3,6 +3,7 @@ --halt-at-warn --no-warn-inferred-erroneous --no-mercury-stdlib-dir +--no-detect-libgrades -I../library -I../browser -I../ssdb diff --git a/ssdb/SSDB_FLAGS.in b/ssdb/SSDB_FLAGS.in index ef5027280..1a7c64699 100644 --- a/ssdb/SSDB_FLAGS.in +++ b/ssdb/SSDB_FLAGS.in @@ -3,6 +3,7 @@ --halt-at-warn --no-warn-inferred-erroneous --no-mercury-stdlib-dir +--no-detect-libgrades --no-shlib-linker-use-install-name --force-disable-tracing --force-disable-ssdebug