diff --git a/STANDARD_MCFLAGS b/STANDARD_MCFLAGS new file mode 100644 index 000000000..6f70089f8 --- /dev/null +++ b/STANDARD_MCFLAGS @@ -0,0 +1,16 @@ +--halt-at-warn +--no-allow-ho-insts-as-modes +--no-detect-libgrades +--no-halt-at-warn-make-int +--no-halt-at-warn-make-opt +--no-infer-all +--no-mercury-stdlib-dir +--warn-inconsistent-pred-order-clauses +--warn-insts-with-functors-without-type +--warn-known-bad-format-calls +--warn-non-contiguous-clauses +--warn-non-contiguous-foreign-procs +--warn-potentially-ambiguous-pragma +--warn-suspicious-foreign-code +--warn-unknown-format-calls +--warn-unused-imports diff --git a/browser/MDB_FLAGS.in b/browser/MDB_FLAGS.in index 60283240f..1d0154403 100644 --- a/browser/MDB_FLAGS.in +++ b/browser/MDB_FLAGS.in @@ -1,24 +1,9 @@ @BOOTSTRAP_MC_ARGS@ ---no-infer-all ---warn-known-bad-format-calls ---warn-unknown-format-calls ---warn-non-contiguous-clauses ---warn-non-contiguous-foreign-procs ---warn-inconsistent-pred-order-clauses ---warn-unused-imports ---warn-insts-with-functors-without-type ---warn-suspicious-foreign-code +@STANDARD_MCFLAGS@ +--no-shlib-linker-use-install-name +--no-warn-inferred-erroneous --warn-dead-preds --warn-implicit-stream-calls ---warn-potentially-ambiguous-pragma ---halt-at-warn ---no-halt-at-warn-make-int ---no-halt-at-warn-make-opt ---no-warn-inferred-erroneous ---no-allow-ho-insts-as-modes ---no-mercury-stdlib-dir ---no-detect-libgrades ---no-shlib-linker-use-install-name --force-disable-tracing --force-disable-ssdebug --no-libgrade diff --git a/compiler/COMP_FLAGS.in b/compiler/COMP_FLAGS.in index 18f6f60c6..cf1751ee9 100644 --- a/compiler/COMP_FLAGS.in +++ b/compiler/COMP_FLAGS.in @@ -1,22 +1,7 @@ @BOOTSTRAP_MC_ARGS@ ---no-infer-all ---warn-known-bad-format-calls ---warn-unknown-format-calls ---warn-non-contiguous-clauses ---warn-non-contiguous-foreign-procs ---warn-inconsistent-pred-order-clauses ---warn-unused-imports ---warn-insts-with-functors-without-type ---warn-suspicious-foreign-code +@STANDARD_MCFLAGS@ --warn-dead-preds --warn-implicit-stream-calls ---warn-potentially-ambiguous-pragma ---no-allow-ho-insts-as-modes ---halt-at-warn ---no-halt-at-warn-make-int ---no-halt-at-warn-make-opt ---no-mercury-stdlib-dir ---no-detect-libgrades -I../ssdb -I../browser -I../mdbcomp diff --git a/configure.ac b/configure.ac index 4a4481532..d761a11ae 100644 --- a/configure.ac +++ b/configure.ac @@ -5441,6 +5441,13 @@ TESTS_MDB_DOC="`pwd`"/doc/mdb_doc AC_SUBST(TESTS_MDB_INIT_DIR) AC_SUBST(TESTS_MDB_DOC) +#-----------------------------------------------------------------------------# + +STANDARD_MCFLAGS="`cat STANDARD_MCFLAGS`" +AC_SUBST(STANDARD_MCFLAGS) + +#-----------------------------------------------------------------------------# + conf_h_copy="$TMPDIR"/mercury_conf.h.$$ trap "rm -f $conf_h_copy" 0 1 2 3 13 15 if test -f runtime/mercury_conf.h diff --git a/deep_profiler/DEEP_FLAGS.in b/deep_profiler/DEEP_FLAGS.in index 5125627f5..8dda34201 100644 --- a/deep_profiler/DEEP_FLAGS.in +++ b/deep_profiler/DEEP_FLAGS.in @@ -1,22 +1,7 @@ @BOOTSTRAP_MC_ARGS@ ---no-infer-all ---warn-known-bad-format-calls ---warn-unknown-format-calls ---warn-non-contiguous-clauses ---warn-non-contiguous-foreign-procs ---warn-unused-imports ---warn-inconsistent-pred-order-clauses ---warn-insts-with-functors-without-type ---warn-suspicious-foreign-code ---warn-implicit-stream-calls ---warn-potentially-ambiguous-pragma ---halt-at-warn ---no-halt-at-warn-make-int ---no-halt-at-warn-make-opt +@STANDARD_MCFLAGS@ --no-warn-inferred-erroneous ---no-allow-ho-insts-as-modes ---no-mercury-stdlib-dir ---no-detect-libgrades +--warn-implicit-stream-calls -I../ssdb -I../browser -I../library diff --git a/grade_lib/GRADE_LIB_FLAGS.in b/grade_lib/GRADE_LIB_FLAGS.in index 7ab574084..2baec5217 100644 --- a/grade_lib/GRADE_LIB_FLAGS.in +++ b/grade_lib/GRADE_LIB_FLAGS.in @@ -1,21 +1,6 @@ @BOOTSTRAP_MC_ARGS@ ---no-infer-all ---warn-known-bad-format-calls ---warn-unknown-format-calls ---warn-non-contiguous-clauses ---warn-non-contiguous-foreign-procs ---warn-inconsistent-pred-order-clauses ---warn-unused-imports ---warn-insts-with-functors-without-type ---warn-suspicious-foreign-code ---warn-potentially-ambiguous-pragma ---halt-at-warn ---no-halt-at-warn-make-int ---no-halt-at-warn-make-opt +@STANDARD_MCFLAGS@ --no-warn-inferred-erroneous ---no-allow-ho-insts-as-modes ---no-mercury-stdlib-dir ---no-detect-libgrades -I../library --c-include-directory ../boehm_gc --c-include-directory ../boehm_gc/include diff --git a/library/LIB_FLAGS.in b/library/LIB_FLAGS.in index ef91ab7d1..d1244a37d 100644 --- a/library/LIB_FLAGS.in +++ b/library/LIB_FLAGS.in @@ -1,31 +1,16 @@ @BOOTSTRAP_MC_ARGS@ +@STANDARD_MCFLAGS@ +--force-disable-ssdebug +--generate-mmc-deps +--no-libgrade +--no-shlib-linker-use-install-name +--no-warn-inferred-erroneous +--no-warn-stdlib-shadowing --optimize-constructor-last-call --profile-optimized ---no-infer-all ---warn-known-bad-format-calls ---warn-unknown-format-calls ---warn-non-contiguous-clauses ---warn-non-contiguous-foreign-procs ---warn-inconsistent-pred-order-clauses ---warn-unused-imports ---warn-insts-with-functors-without-type ---warn-suspicious-foreign-code ---warn-potentially-ambiguous-pragma ---halt-at-warn ---no-halt-at-warn-make-int ---no-halt-at-warn-make-opt ---no-warn-stdlib-shadowing ---warn-dead-predicates ---no-warn-inferred-erroneous ---no-allow-ho-insts-as-modes ---no-mercury-stdlib-dir ---no-detect-libgrades --strict-sequential ---generate-mmc-deps ---no-shlib-linker-use-install-name --trace minimum ---force-disable-ssdebug ---no-libgrade +--warn-dead-predicates --c-include-directory ../boehm_gc --c-include-directory ../boehm_gc/include --c-include-directory ../runtime diff --git a/mdbcomp/MDBCOMP_FLAGS.in b/mdbcomp/MDBCOMP_FLAGS.in index ac166fec5..dc7fb5b0e 100644 --- a/mdbcomp/MDBCOMP_FLAGS.in +++ b/mdbcomp/MDBCOMP_FLAGS.in @@ -1,26 +1,11 @@ @BOOTSTRAP_MC_ARGS@ ---no-infer-all ---warn-known-bad-format-calls ---warn-unknown-format-calls ---warn-non-contiguous-clauses ---warn-non-contiguous-foreign-procs ---warn-inconsistent-pred-order-clauses ---warn-unused-imports ---warn-insts-with-functors-without-type ---warn-suspicious-foreign-code ---warn-implicit-stream-calls ---warn-potentially-ambiguous-pragma ---halt-at-warn ---no-halt-at-warn-make-int ---no-halt-at-warn-make-opt ---no-warn-inferred-erroneous ---no-allow-ho-insts-as-modes ---no-mercury-stdlib-dir ---no-detect-libgrades ---generate-mmc-deps +@STANDARD_MCFLAGS@ --force-disable-ssdebug +--generate-mmc-deps --no-libgrade --no-shlib-linker-use-install-name +--no-warn-inferred-erroneous +--warn-implicit-stream-calls -I../library --c-include-directory ../boehm_gc --c-include-directory ../boehm_gc/include diff --git a/mfilterjavac/MFILTERJAVAC_FLAGS.in b/mfilterjavac/MFILTERJAVAC_FLAGS.in index 2ad418566..62913a8e3 100644 --- a/mfilterjavac/MFILTERJAVAC_FLAGS.in +++ b/mfilterjavac/MFILTERJAVAC_FLAGS.in @@ -1,20 +1,6 @@ @BOOTSTRAP_MC_ARGS@ ---no-infer-all ---warn-known-bad-format-calls ---warn-unknown-format-calls ---warn-non-contiguous-clauses ---warn-non-contiguous-foreign-procs ---warn-inconsistent-pred-order-clauses ---warn-unused-imports ---warn-insts-with-functors-without-type ---warn-potentially-ambiguous-pragma ---halt-at-warn ---no-halt-at-warn-make-int ---no-halt-at-warn-make-opt +@STANDARD_MCFLAGS@ --no-warn-inferred-erroneous ---no-allow-ho-insts-as-modes ---no-mercury-stdlib-dir ---no-detect-libgrades -I../ssdb -I../browser -I../library diff --git a/profiler/PROF_FLAGS.in b/profiler/PROF_FLAGS.in index 993a1b8b8..86f6e5fab 100644 --- a/profiler/PROF_FLAGS.in +++ b/profiler/PROF_FLAGS.in @@ -1,22 +1,7 @@ @BOOTSTRAP_MC_ARGS@ ---no-infer-all ---warn-known-bad-format-calls ---warn-unknown-format-calls ---warn-non-contiguous-clauses ---warn-non-contiguous-foreign-procs ---warn-inconsistent-pred-order-clauses ---warn-unused-imports ---warn-insts-with-functors-without-type ---warn-suspicious-foreign-code ---warn-implicit-stream-calls ---warn-potentially-ambiguous-pragma ---halt-at-warn ---no-halt-at-warn-make-int ---no-halt-at-warn-make-opt +@STANDARD_MCFLAGS@ --no-warn-inferred-erroneous ---no-allow-ho-insts-as-modes ---no-mercury-stdlib-dir ---no-detect-libgrades +--warn-implicit-stream-calls -I../ssdb -I../browser -I../mdbcomp diff --git a/slice/SLICE_FLAGS.in b/slice/SLICE_FLAGS.in index 4e7dd23cb..1eeb1bb0a 100644 --- a/slice/SLICE_FLAGS.in +++ b/slice/SLICE_FLAGS.in @@ -1,21 +1,6 @@ @BOOTSTRAP_MC_ARGS@ ---no-infer-all ---warn-known-bad-format-calls ---warn-unknown-format-calls ---warn-non-contiguous-clauses ---warn-non-contiguous-foreign-procs ---warn-inconsistent-pred-order-clauses ---warn-unused-imports ---warn-insts-with-functors-without-type ---warn-suspicious-foreign-code ---warn-potentially-ambiguous-pragma ---halt-at-warn ---no-halt-at-warn-make-int ---no-halt-at-warn-make-opt +@STANDARD_MCFLAGS@ --no-warn-inferred-erroneous ---no-allow-ho-insts-as-modes ---no-mercury-stdlib-dir ---no-detect-libgrades -I../ssdb -I../browser -I../library diff --git a/ssdb/SSDB_FLAGS.in b/ssdb/SSDB_FLAGS.in index aab398cba..874ea6e76 100644 --- a/ssdb/SSDB_FLAGS.in +++ b/ssdb/SSDB_FLAGS.in @@ -1,26 +1,11 @@ @BOOTSTRAP_MC_ARGS@ ---no-infer-all ---warn-known-bad-format-calls ---warn-unknown-format-calls ---warn-non-contiguous-clauses ---warn-non-contiguous-foreign-procs ---warn-inconsistent-pred-order-clauses ---warn-unused-imports ---warn-insts-with-functors-without-type ---warn-suspicious-foreign-code ---warn-potentially-ambiguous-pragma ---halt-at-warn ---no-halt-at-warn-make-int ---no-halt-at-warn-make-opt ---no-warn-inferred-erroneous ---no-allow-ho-insts-as-modes ---no-mercury-stdlib-dir ---no-detect-libgrades ---no-shlib-linker-use-install-name ---force-disable-tracing +@STANDARD_MCFLAGS@ --force-disable-ssdebug ---no-libgrade +--force-disable-tracing --generate-mmc-deps +--no-libgrade +--no-shlib-linker-use-install-name +--no-warn-inferred-erroneous -I../browser -I../mdbcomp -I../library