[m-rev.] trivial diff: don't use ?= in Mmakefiles

Simon Taylor stayl at cs.mu.OZ.AU
Thu May 9 18:47:17 AEST 2002


Estimated hours taken: 0.2
Branches: main

Mmake.workspace:
tests/debugger/Mmakefile:
	Don't use '?='. Old versions of `make' don't support it.

Index: Mmake.workspace
===================================================================
RCS file: /home/mercury1/repository/mercury/Mmake.workspace,v
retrieving revision 1.4
diff -u -u -r1.4 Mmake.workspace
--- Mmake.workspace	4 May 2002 15:15:48 -0000	1.4
+++ Mmake.workspace	9 May 2002 08:39:57 -0000
@@ -29,11 +29,21 @@
 # and library directories to be included in MLFLAGS, MLLIBS and CFLAGS.
 
 #-----------------------------------------------------------------------------#
-LINK_STATIC ?= no
-SET_RPATH ?= yes
-LINK_BOEHM_GC_ONLY ?= no
-LINK_RUNTIME_ONLY ?= no
-LINK_STDLIB_ONLY ?= no
+ifeq ($(origin LINK_STATIC),undefined)
+LINK_STATIC = no
+endif
+ifeq ($(origin SET_RPATH),undefined)
+SET_RPATH = yes
+endif
+ifeq ($(origin LINK_BOEHM_GC_ONLY),undefined)
+LINK_BOEHM_GC_ONLY = no
+endif
+ifeq ($(origin LINK_RUNTIME_ONLY),undefined)
+LINK_RUNTIME_ONLY = no
+endif
+ifeq ($(origin LINK_STDLIB_ONLY),undefined)
+LINK_STDLIB_ONLY = no
+endif
 
 SCRIPTS_DIR = $(WORKSPACE)/scripts
 RUNTIME_DIR = $(WORKSPACE)/runtime
Index: tests/debugger//Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/Mmakefile,v
retrieving revision 1.75
diff -u -u -r1.75 Mmakefile
--- tests/debugger//Mmakefile	4 May 2002 15:16:03 -0000	1.75
+++ tests/debugger//Mmakefile	9 May 2002 08:25:52 -0000
@@ -75,7 +75,9 @@
 # this means it won't work properly if the static libraries are linked
 # (as is done by tools/bootcheck and tools/lmc).
 # So we only enable it if LINK_STATIC is not set.
-LINK_STATIC ?= no
+ifeq ($(origin LINK_STATIC),undefined)
+LINK_STATIC = no
+endif
 ifeq ($(LINK_STATIC),no)
 	RETRY_PROGS := $(RETRY_PROGS) interactive
 endif
--------------------------------------------------------------------------
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