[m-rev.] diff: build Mercury with --no-detect-libgrades

Julien Fischer jfischer at opturion.com
Tue Sep 10 17:30:02 AEST 2013


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.

Julien.

diff --git a/browser/MDB_FLAGS.in b/browser/MDB_FLAGS.in
index 8a593d7..919fcf5 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 7176b64..2bd9fc1 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 d73d03a..1d507f6 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 9eb6e45..4d199d7 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 7c88bdb..0595c76 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 5aa3b4a..462cb53 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 39bd943..9772960 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 2a4321c..d6e5c78 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 ef50272..1a7c646 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



More information about the reviews mailing list