trivial diff: Mmakefile bug fix for *.gc.prof.tr

Fergus Henderson fjh at cs.mu.oz.au
Thu Nov 6 17:18:07 AEDT 1997


Fix a bug that broke grades `*.gc.prof.tr'.

runtime/Mmakefile:
library/Mmakefile:
compiler/Mmakefile:
profiler/Mmakefile:
	When deciding whether to link with -lgc or -lgc_prof,
	match against `*.gc*.prof*' rather than `*.gc*.prof'.
				 ^

cvs diff  compiler/Mmakefile library/Mmakefile profiler/Mmakefile runtime/Mmakefile
Index: compiler/Mmakefile
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/Mmakefile,v
retrieving revision 1.5
diff -u -r1.5 Mmakefile
--- Mmakefile	1997/09/14 04:06:18	1.5
+++ Mmakefile	1997/11/06 06:14:12
@@ -36,7 +36,7 @@
 MLLIBS  =	$(EXTRA_MLLIBS) $(LIBRARY_DIR)/libmercury.a \
 		$(RUNTIME_DIR)/libmer.a ` \
 		    case $(GRADE) in \
-			*.gc*.prof) echo $(BOEHM_GC_DIR)/libgc_prof.a ;; \
+			*.gc*.prof*) echo $(BOEHM_GC_DIR)/libgc_prof.a ;; \
 			*.gc*) echo $(BOEHM_GC_DIR)/libgc.a ;; \
 		    esac \
 		` -lm
Index: library/Mmakefile
===================================================================
RCS file: /home/staff/zs/imp/mercury/library/Mmakefile,v
retrieving revision 1.18
diff -u -r1.18 Mmakefile
--- Mmakefile	1997/09/30 00:14:30	1.18
+++ Mmakefile	1997/11/06 06:13:50
@@ -61,7 +61,7 @@
 LDFLAGS	=	-L$(BOEHM_GC_DIR) -L$(RUNTIME_DIR)
 LDLIBS	=	-lmer							\
 		` case "$(GRADE)" in 					\
-		    *.gc*.prof)	echo "-lgc_prof" ;;			\
+		    *.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.4
diff -u -r1.4 Mmakefile
--- Mmakefile	1997/09/14 04:06:33	1.4
+++ Mmakefile	1997/11/06 06:14:27
@@ -35,7 +35,7 @@
 MLLIBS  =	$(EXTRA_MLLIBS) $(LIBRARY_DIR)/libmercury.a \
 		$(RUNTIME_DIR)/libmer.a ` \
 		    case $(GRADE) in \
-			*.gc*.prof) echo $(BOEHM_GC_DIR)/libgc_prof.a ;; \
+			*.gc*.prof*) echo $(BOEHM_GC_DIR)/libgc_prof.a ;; \
 			*.gc*) echo $(BOEHM_GC_DIR)/libgc.a ;; \
 		    esac \
 		` -lm
Index: runtime/Mmakefile
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/Mmakefile,v
retrieving revision 1.15
diff -u -r1.15 Mmakefile
--- Mmakefile	1997/10/03 04:56:28	1.15
+++ Mmakefile	1997/11/06 06:13:20
@@ -55,7 +55,7 @@
 LDFLAGS		= -L$(BOEHM_GC_DIR)
 LDLIBS		= \
 		` case "$(GRADE)" in 					\
-		    *.gc*.prof)	echo "-lgc_prof" ;;			\
+		    *.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