[m-rev.] diff: use ml --print-gc-grade` in Mmake.workspaces

[Peter Ross]

Hi,


===================================================================


Estimated hours taken: 1
Branches: main

Mmake.workspace:
	Use `ml --print-gc-grade` to determine the name of the gc library.


Index: Mmake.workspace
===================================================================
RCS file: /home/mercury1/repository/mercury/Mmake.workspace,v
retrieving revision 1.23
diff -U5 -r1.23 Mmake.workspace
--- Mmake.workspace	15 Sep 2006 03:53:35 -0000	1.23
+++ Mmake.workspace	17 Oct 2006 06:06:14 -0000
@@ -153,29 +153,26 @@
 # The $(shell) here is needed to allow the variable values in
 # ECHO_MERCURY_OPTIONS in Mmake.vars to be single-quoted when
 # passed to echo in order to preserve double-quotes (e.g. for
 # file names containing spaces).
 #
+GC_LIBS_0=`ml --grade $(GRADE) --print-gc-grade`
+GC_LIBS=$(shell echo $(GC_LIBS_0))
+
 STATIC_GC_LIBS_0 = 						\
 	`							\
 	    case $(GRADE) in					\
-		*.par*.gc*.prof*) echo $(BOEHM_GC_DIR)/libpar_gc_prof.$A ;; \
-		*.par*.gc*)	echo $(BOEHM_GC_DIR)/libpar_gc.$A ;; \
-		*.gc*.prof*)	echo $(BOEHM_GC_DIR)/libgc_prof.$A ;; \
-		*.gc*)		echo $(BOEHM_GC_DIR)/libgc.$A ;; \
+	    	*.gc*)		echo $(BOEHM_GC_DIR)/lib$(GC_LIBS).$A	;; \
 		*.mps*)		echo $(MPS_GC_OBJ_DIR)/mps.$A ;; \
 	    esac						\
 	`
 STATIC_GC_LIBS = $(shell echo $(STATIC_GC_LIBS_0))
 
 SHARED_GC_LIBS_0 =						\
 	 `							\
 	    case $(GRADE) in					\
-		*.par*.gc*.prof*) echo -lpar_gc_prof ;;		\
-		*.par*.gc*)	echo -lpar_gc ;;		\
-		*.gc*.prof*)	echo -lgc_prof ;;		\
-		*.gc*)		echo -lgc ;;			\
+		*.gc*)		echo -l$(GC_LIBS) ;;		\
 		*.mps*)		echo $(MPS_GC_OBJ_DIR)/mps.$A ;; \
 	    esac						\
 	`
 SHARED_GC_LIBS = $(shell echo $(SHARED_GC_LIBS_0))
 

--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------