diff: fix to Mmakefiles for asm_fast.gc.tr grade

Fergus Henderson fjh at cs.mu.oz.au
Sun Sep 14 14:04:36 AEST 1997


runtime/Mmakefile:
library/Mmakefile:
compiler/Mmakefile:
profiler/Mmakefile:
	Match $(GRADE) against `*.gc*' rather than `*.gc', so that it
	will link in the GC library for grades such as `asm_fast.gc.tr'.

Index: compiler/Mmakefile
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/Mmakefile,v
retrieving revision 1.4
diff -u -r1.4 Mmakefile
--- Mmakefile	1997/08/28 17:51:33	1.4
+++ Mmakefile	1997/09/14 04:01:14
@@ -36,8 +36,8 @@
 MLLIBS  =	$(EXTRA_MLLIBS) $(LIBRARY_DIR)/libmercury.a \
 		$(RUNTIME_DIR)/libmer.a ` \
 		    case $(GRADE) in \
-			*.gc.prof) echo $(BOEHM_GC_DIR)/libgc_prof.a ;; \
-			*.gc) echo $(BOEHM_GC_DIR)/libgc.a ;; \
+			*.gc*.prof) echo $(BOEHM_GC_DIR)/libgc_prof.a ;; \
+			*.gc*) echo $(BOEHM_GC_DIR)/libgc.a ;; \
 		    esac \
 		` -lm
 MSC	=	MERCURY_SICSTUS_COMPILER=$(LIBRARY_DIR)/sicstus_compile \
Index: library/Mmakefile
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/Mmakefile,v
retrieving revision 1.13
diff -u -r1.13 Mmakefile
--- Mmakefile	1997/08/28 17:51:45	1.13
+++ Mmakefile	1997/09/14 04:00:36
@@ -61,8 +61,8 @@
 LDFLAGS	=	-L$(BOEHM_GC_DIR) -L$(RUNTIME_DIR)
 LDLIBS	=	-lmer							\
 		` case "$(GRADE)" in 					\
-		    *.gc.prof)	echo "-lgc_prof" ;;			\
-		    *.gc)	echo "-lgc" ;;				\
+		    *.gc*.prof)	echo "-lgc_prof" ;;			\
+		    *.gc*)	echo "-lgc" ;;				\
 		  esac							\
 		`
 
Index: profiler/Mmakefile
===================================================================
RCS file: /home/staff/zs/imp/mercury/profiler/Mmakefile,v
retrieving revision 1.3
diff -u -r1.3 Mmakefile
--- Mmakefile	1997/07/27 15:07:43	1.3
+++ Mmakefile	1997/09/14 04:01:33
@@ -35,8 +35,8 @@
 MLLIBS  =	$(EXTRA_MLLIBS) $(LIBRARY_DIR)/libmercury.a \
 		$(RUNTIME_DIR)/libmer.a ` \
 		    case $(GRADE) in \
-			*.gc.prof) echo $(BOEHM_GC_DIR)/libgc_prof.a ;; \
-			*.gc) echo $(BOEHM_GC_DIR)/libgc.a ;; \
+			*.gc*.prof) echo $(BOEHM_GC_DIR)/libgc_prof.a ;; \
+			*.gc*) echo $(BOEHM_GC_DIR)/libgc.a ;; \
 		    esac \
 		` -lm
 MSL	=	MERCURY_SP_LIB_DIR=$(LIBRARY_DIR) $(SCRIPTS_DIR)/msl
Index: runtime/Mmakefile
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/Mmakefile,v
retrieving revision 1.10
diff -u -r1.10 Mmakefile
--- Mmakefile	1997/08/28 17:52:14	1.10
+++ Mmakefile	1997/09/14 04:00:52
@@ -56,8 +56,8 @@
 LDFLAGS		= -L$(BOEHM_GC_DIR)
 LDLIBS		= \
 		` case "$(GRADE)" in 					\
-		    *.gc.prof)	echo "-lgc_prof" ;;			\
-		    *.gc)	echo "-lgc" ;;				\
+		    *.gc*.prof)	echo "-lgc_prof" ;;			\
+		    *.gc*)	echo "-lgc" ;;				\
 		  esac							\
 		`
 
-- 
Fergus Henderson <fjh at cs.mu.oz.au>   |  "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh>   |  of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3         |     -- the last words of T. S. Garp.



More information about the developers mailing list