[m-rev.] diff: scripts/mmc.in: delete --cflags-for-threads bootstrap hack

[Fergus Henderson]

Estimated hours taken: 0.25
Branches: release, main

scripts/mmc.in:
	Delete an old bootstrapping hack that is no longer needed.

Workspace: /home/hg/fjh/ws-hg3/mercury
Index: scripts/mmc.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/mmc.in,v
retrieving revision 1.15
diff -u -d -r1.15 mmc.in
--- scripts/mmc.in	2000/09/18 07:06:32	1.15
+++ scripts/mmc.in	2001/04/09 08:52:15
@@ -35,19 +35,6 @@
 HAVE_BOXED_FLOATS=@HAVE_BOXED_FLOATS@
 DEFAULT_OPT_LEVEL=${MERCURY_DEFAULT_OPT_LEVEL="-O2"}
 
-# XXX Temporary hack for bootstrapping purposes:
-# invoke $MC to test if it supports the --cflags-for-threads option.
-case "`$MC --cflags-for-threads </dev/null 2>&1`" in
-	*"unrecognized option"*)
-		# This value will get overridden by
-		# the later setting of --cflags-for-regs, so
-		# it will just get ignored
-		THREADS_OPT="--cflags-for-regs"
-		;;
-	*)
-		THREADS_OPT="--cflags-for-threads"
-esac
-
 # The default optimization level should be after
 # all the options that describe the machine configuration.
 
@@ -55,7 +42,7 @@
 	0) exec $MC \
 		$MERC_ALL_MC_C_INCL_DIRS \
 		--cc "$CC" --grade "$DEFAULT_GRADE" \
-		$THREADS_OPT "$CFLAGS_FOR_THREADS" \
+		--cflags-for-threads "$CFLAGS_FOR_THREADS" \
 		--cflags-for-regs "$CFLAGS_FOR_REGS" \
 		--cflags-for-gotos "$CFLAGS_FOR_GOTOS" \
 		--c-flag-to-name-object-file "$CFLAG_TO_NAME_OBJECT_FILE" \
@@ -73,7 +60,7 @@
 	*) exec $MC \
 		$MERC_ALL_MC_C_INCL_DIRS \
 		--cc "$CC" --grade "$DEFAULT_GRADE" \
-		$THREADS_OPT "$CFLAGS_FOR_THREADS" \
+		--cflags-for-threads "$CFLAGS_FOR_THREADS" \
 		--cflags-for-regs "$CFLAGS_FOR_REGS" \
 		--cflags-for-gotos "$CFLAGS_FOR_GOTOS" \
 		--c-flag-to-name-object-file "$CFLAG_TO_NAME_OBJECT_FILE" \

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
                                    |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------