[m-rev.] for review: simplify library/compiler Mmakefiles

[Simon Taylor]

On 25-Apr-2002, Simon Taylor <stayl at cs.mu.OZ.AU> wrote:
> 
> Estimated hours taken: 8
> Branches: main
> 
> Factor out the common Mmake code to set up the mmc, mgnuc
> and ml flags when building the Mercury compiler and libraries.
> Use options, not environment variables. This will make it simpler
> to use `mmc --make' to compile the compiler.

I'm going to commit this change now with the following extra diff.
Committing this change is necessary to fix problems building the
library with `--split-c-files'. The problem was that the bootcheck
script wasn't setting up the C include directories for mmc properly.
Previously, this resulted in the installed header files being
used, but my change to add the MERCURY_STDLIB_DIR environment
variable disabled use of the installed headers if MERCURY_INT_DIR
was set (which bootcheck does).

Simon.


configure.in:
	Check for the `--no-mercury-stdlib-dir' mmc option.
	Bootstrap CVS tag: bootstrap_20020429_stdlib_dir

Index: configure.in
===================================================================
RCS file: /home/mercury1/repository/mercury/configure.in,v
retrieving revision 1.302
diff -u -u -r1.302 configure.in
--- configure.in	5 Apr 2002 15:22:47 -0000	1.302
+++ configure.in	29 Apr 2002 07:34:56 -0000
@@ -119,13 +119,16 @@
 		").
 EOF
 	if
-		# Test for the `--generate-mmc-deps' option.
+		# Test for the `--generate-mmc-deps' and
+		# `--no-mercury-stdlib-dir' options.
 		echo $BOOTSTRAP_MC conftest >&AC_FD_CC 2>&1 &&
 		$BOOTSTRAP_MC \
 			--generate-mmc-deps \
 			--halt-at-warn $link_flags conftest \
 			</dev/null >&AC_FD_CC 2>&1 &&
-		test "`./conftest 2>&1 | tr -d '\015'`" = "Hello, world"
+		test "`./conftest 2>&1 | tr -d '\015'`" = "Hello, world" &&
+		$BOOTSTRAP_MC --output-grade-string --no-mercury-stdlib-dir \
+			</dev/null >&AC_FD_CC 2>&1
 	then
 		AC_MSG_RESULT(yes)
 	else
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------