[m-rev.] diff: fix problem with the runtests target in the C# grade
Julien Fischer
jfischer at opturion.com
Tue Jul 8 16:41:56 AEST 2014
Branches: 14.01, master
Fix a problem with the runtests target in the C# grade.
Mmake.workspace:
Don't pass the static archives for the Mercury libraries via --link-object
(MLOBJS) when building compiler executables and test cases in the C# grade.
The origin of this setting was (probably) the old il grade; it doesn't
make sense for the csharp grade however and prevents the test suite from
working properly in that grade.
Julien.
diff --git a/Mmake.workspace b/Mmake.workspace
index aa7384d..0e557ed 100644
--- a/Mmake.workspace
+++ b/Mmake.workspace
@@ -210,8 +210,10 @@ STATIC_TRACE_LIBS = $(TRACE_DIR)/lib$(TRACE_LIB_NAME).$A \
endif
endif
endif
+ifeq ("$(filter csharp%,$(GRADE))","")
MLOBJS += $(STATIC_TRACE_LIBS) $(STATIC_STD_LIBS) \
$(STATIC_RT_LIBS) $(STATIC_GC_LIBS)
+endif
MCFLAGS += --mercury-linkage static
More information about the reviews
mailing list