[m-rev.] trivial diff: don't build runtime in grade java
Fergus Henderson
fjh at cs.mu.OZ.AU
Sun Jul 13 18:19:02 AEST 2003
Estimated hours taken: 0.25
Branches: main
runtime/Mmakefile:
Don't try to build the C runtime in grade `java'.
Workspace: /home/ceres/fjh/mercury
Index: runtime/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/Mmakefile,v
retrieving revision 1.102
diff -u -d -r1.102 Mmakefile
--- runtime/Mmakefile 18 Mar 2003 16:38:08 -0000 1.102
+++ runtime/Mmakefile 14 May 2003 10:46:18 -0000
@@ -266,6 +266,15 @@
#-----------------------------------------------------------------------------#
+ifeq ($(findstring java,$(GRADE)),java)
+#
+# For grade java, there's nothing to do
+
+.PHONY: runtime
+runtime:
+ @echo "No Mercury runtime needed for grade=java"
+
+else
ifeq ($(findstring il,$(GRADE)),il)
# Managed C++ files compiled in this directory should not be put in an
@@ -311,6 +320,7 @@
$(SHARED_LIBS)
endif
+endif
$(RT_LIB_NAME).init: $(CFILES)
cat `vpath_find $(CFILES)` | grep '^INIT ' > $(RT_LIB_NAME).init
@@ -345,6 +355,20 @@
-[ -d $(INSTALL_RECONF_DIR)/runtime ] || \
mkdir -p $(INSTALL_RECONF_DIR)/runtime
+ifeq ($(findstring java,$(GRADE)),java)
+
+# For grade java, there's nothing to do
+
+.PHONY: install_headers
+install_headers:
+
+.PHONY: install_init
+install_init:
+
+.PHONY: install_init
+install_init:
+
+else
ifeq ($(findstring il,$(GRADE)),il)
.PHONY: install_headers
@@ -389,6 +413,7 @@
$(INSTALL_MERC_LIB_DIR)
$(RANLIB) $(INSTALL_MERC_LIB_DIR)/lib$(RT_LIB_NAME).$A
+endif
endif
#-----------------------------------------------------------------------------#
--
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
--------------------------------------------------------------------------
More information about the reviews
mailing list