[m-rev.] diff: fix tests/hard_coded/parse failure

Simon Taylor stayl at cs.mu.OZ.AU
Sun Dec 1 01:41:12 AEDT 2002


Estimated hours taken: 0.25
Branches: main, release

tests/hard_coded/Mmakefile:
	The parse is linked with the debugging libraries, so disable
	it in grades for which debugging is not supported.

Index: Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/Mmakefile,v
retrieving revision 1.173.2.4
diff -u -u -r1.173.2.4 Mmakefile
--- Mmakefile	24 Nov 2002 04:32:12 -0000	1.173.2.4
+++ Mmakefile	29 Nov 2002 10:05:16 -0000
@@ -274,10 +274,13 @@
 
 # Static linking doesn't work on Solaris in debug grades
 # ('-ldl' doesn't work with static linking).
+STATIC_LINK_PROGS =
 ifneq "$(findstring solaris,$(FULLARCH)) $(findstring debug,$(GRADE))" "solaris debug"
-	STATIC_LINK_PROGS = parse
-else
-	STATIC_LINK_PROGS =
+	# The `parse' test also links with the debug libraries,
+	# so it only works in LLDS grades.
+	ifeq "$(filter hl% java% il%,$(GRADE))" ""
+		STATIC_LINK_PROGS = parse
+	endif
 endif
 
 PROGS = $(ORDINARY_PROGS) $(BROKEN_FOR_LCC_PROGS) $(CLOSURE_LAYOUT_PROGS) \
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------



More information about the reviews mailing list