[m-rev.] diff: Mmake target-specific variables v.s. --use-subdirs

[Fergus Henderson]

Estimated hours taken: 1
Branches: main

scripts/Mmake.vars.in:
	Fix an Mmake bug which broke tests/hard_coded/integer_test and
	tests/hard_coded/rational_test in grade asm_fast when built with
	--use-subdirs.	The problem was that target-specific variable
	definitions where not getting set correctly when building the
	*_init.c file, because various references to `%_init.c' in this
	file should have been `$(cs_subdir)%_init.c'.

Workspace: /home/mars/fjh/ws1/mercury
Index: scripts/Mmake.vars.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/Mmake.vars.in,v
retrieving revision 1.63
diff -u -d -r1.63 Mmake.vars.in
--- scripts/Mmake.vars.in	19 Feb 2002 10:56:22 -0000	1.63
+++ scripts/Mmake.vars.in	27 Feb 2002 11:03:28 -0000
@@ -366,10 +366,10 @@
   $(maybe-base-GRADEFLAGS-$(findstring undefined,\
 		$(origin GRADEFLAGS-$(patsubst %_init,%,$*)))) \
   $(maybe-target-GRADEFLAGS-$(findstring undefined,\
-  		$(origin GRADEFLAGS-$(patsubst %_init.c,%,$@))))
+  		$(origin GRADEFLAGS-$(patsubst $(cs_subdir)%_init.c,%,$@))))
 maybe-base-GRADEFLAGS- = $(GRADEFLAGS-$(patsubst %_init,%,$*))
 maybe-base-GRADEFLAGS-undefined =
-maybe-target-GRADEFLAGS- = $(GRADEFLAGS-$(patsubst %_init.c,%,$@))
+maybe-target-GRADEFLAGS- = $(GRADEFLAGS-$(patsubst $(cs_subdir)%_init.c,%,$@))
 maybe-target-GRADEFLAGS-undefined =
 
 TARGET_MCFLAGS = \
@@ -379,18 +379,18 @@
 
 TARGET_C2INITFLAGS = \
   $(maybe-target-C2INITFLAGS-$(findstring undefined,\
-		$(origin C2INITFLAGS-$(patsubst %_init.c,%,$@))))
-maybe-target-C2INITFLAGS- = $(C2INITFLAGS-$(patsubst %_init.c,%,$@))
+		$(origin C2INITFLAGS-$(patsubst $(cs_subdir)%_init.c,%,$@))))
+maybe-target-C2INITFLAGS- = $(C2INITFLAGS-$(patsubst $(cs_subdir)%_init.c,%,$@))
 maybe-target-C2INITFLAGS-undefined =
 
 TARGET_C2INITARGS = \
   $(maybe-base-C2INITARGS-$(findstring undefined,\
 		$(origin C2INITARGS-$*))) \
   $(maybe-target-C2INITARGS-$(findstring undefined,\
-		$(origin C2INITARGS-$(patsubst %_init.c,%,$@))))
+		$(origin C2INITARGS-$(patsubst $(cs_subdir)%_init.c,%,$@))))
 maybe-base-C2INITARGS- = $(C2INITARGS-$*)
 maybe-base-C2INITARGS-undefined =
-maybe-target-C2INITARGS- = $(C2INITARGS-$(patsubst %_init.c,%,$@))
+maybe-target-C2INITARGS- = $(C2INITARGS-$(patsubst $(cs_subdir)%_init.c,%,$@))
 maybe-target-C2INITARGS-undefined =
 
 TARGET_MGNUCFLAGS = \
@@ -411,8 +411,8 @@
 # an argument of a `c2init' rule or an `ml' rule.
 TARGET_MLFLAGS = \
   $(maybe-target-MLFLAGS-$(findstring undefined,\
-		$(origin MLFLAGS-$(patsubst %_init.c,%,$@))))
-maybe-target-MLFLAGS- = $(MLFLAGS-$(patsubst %_init.c,%,$@))
+		$(origin MLFLAGS-$(patsubst $(cs_subdir)%_init.c,%,$@))))
+maybe-target-MLFLAGS- = $(MLFLAGS-$(patsubst $(cs_subdir)%_init.c,%,$@))
 maybe-target-MLFLAGS-undefined =
 
 TARGET_LDFLAGS = \
@@ -450,8 +450,9 @@
 # an argument of a `c2init' rule or an `ml' rule.
 TARGET_EXTRA_LIBRARIES = \
   $(maybe-target-EXTRA_LIBRARIES-$(findstring undefined,\
-		$(origin EXTRA_LIBRARIES-$(patsubst %_init.c,%,$@))))
-maybe-target-EXTRA_LIBRARIES- = $(EXTRA_LIBRARIES-$(patsubst %_init.c,%,$@))
+	$(origin EXTRA_LIBRARIES-$(patsubst $(cs_subdir)%_init.c,%,$@))))
+maybe-target-EXTRA_LIBRARIES- = \
+  $(EXTRA_LIBRARIES-$(patsubst $(cs_subdir)%_init.c,%,$@))
 maybe-target-EXTRA_LIBRARIES-undefined =
 
 TARGET_LIBGRADES = \

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------