mercurylang/mercury
1
0
Fork 0
mirror of https://github.com/Mercury-Language/mercury.git synced 2025-12-14 05:12:33 +00:00
Code Issues Projects Releases Wiki Activity

Fix some minor make annoyances.

Browse Source
This commit is contained in:
Zoltan Somogyi
2015-08-26 01:32:52 +10:00
parent e0cdfc2fe2
commit 3a0401afec
3 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Mmake.workspace
View File

@@ -50,6 +50,9 @@ endif
ifeq ($(origin LINK_STDLIB_ONLY),undefined) ifeq ($(origin LINK_STDLIB_ONLY),undefined)
LINK_STDLIB_ONLY = no LINK_STDLIB_ONLY = no
endif endif
ifeq ($(origin EXTRA_MTAGSFLAGS),undefined)
EXTRA_MTAGSFLAGS =
endif
SCRIPTS_DIR = $(WORKSPACE)/scripts SCRIPTS_DIR = $(WORKSPACE)/scripts
RUNTIME_DIR = $(WORKSPACE)/runtime RUNTIME_DIR = $(WORKSPACE)/runtime

31
scripts/Mmake.vars.in
View File

@@ -99,7 +99,7 @@ endif
#-----------------------------------------------------------------------------# #-----------------------------------------------------------------------------#
#-----------------------------------------------------------------------------# #-----------------------------------------------------------------------------#
# #
# Stuff which is not specific to any back-end # Stuff which is not specific to any back-end.
# #
ALL_GRADEFLAGS = $(USUAL_GRADEFLAGS) ALL_GRADEFLAGS = $(USUAL_GRADEFLAGS)
@@ -115,9 +115,8 @@ LIB_MCFLAGS = $(patsubst %,--mld %,$(EXTRA_LIB_DIRS)) \
$(patsubst %,--ml %,$(EXTRA_LIBRARIES)) $(patsubst %,--ml %,$(EXTRA_LIBRARIES))
# Flags for use with `mmc --make'. # Flags for use with `mmc --make'.
# Pass the options as a Mercury.options file on stdin rather # Pass the options as a Mercury.options file on stdin rather than on the
# than on the command line. This avoids problems with quoting # command line. This avoids problems with quoting and unwanted word splitting.
# and unwanted word splitting.
ECHO_MERCURY_OPTIONS = { \ ECHO_MERCURY_OPTIONS = { \
echo MCFLAGS += '$(ALL_GRADEFLAGS) $(ALL_MCFLAGS)'; \ echo MCFLAGS += '$(ALL_GRADEFLAGS) $(ALL_MCFLAGS)'; \
echo MCFLAGS += '$(MC_MAKE_FLAGS) $(EXTRA_MC_MAKE_FLAGS)'; \ echo MCFLAGS += '$(MC_MAKE_FLAGS) $(EXTRA_MC_MAKE_FLAGS)'; \
@@ -189,7 +188,7 @@ EXTRA_MCSFLAGS = $(EXTRA_MCFLAGS)
#-----------------------------------------------------------------------------# #-----------------------------------------------------------------------------#
# #
# Stuff which is specific to the C back-ends # Stuff which is specific to the C back-ends.
# #
# FIX_PATH_FOR_<foo> should be set to a script which converts path names # FIX_PATH_FOR_<foo> should be set to a script which converts path names
@@ -228,11 +227,11 @@ MERC_DLL_DIR = $(MERCURY_STDLIB_DIR)/lib/$(GRADESTRING)
# which has a different command-line interface. # which has a different command-line interface.
# (Is there a Mono ILASM too? What about Rotor?) # (Is there a Mono ILASM too? What about Rotor?)
ILASM = @ILASM@ ILASM = @ILASM@
ALL_ILASMFLAGS= $(ILASMFLAGS) $(EXTRA_ILASMFLAGS) \ ALL_ILASMFLAGS = $(ILASMFLAGS) $(EXTRA_ILASMFLAGS) \
$(TARGET_ILASMFLAGS) $(LIB_ILASMFLAGS) $(ILASM_KEYFLAG) $(TARGET_ILASMFLAGS) $(LIB_ILASMFLAGS) $(ILASM_KEYFLAG)
ILASMFLAGS = ILASMFLAGS =
EXTRA_ILASMFLAGS = EXTRA_ILASMFLAGS =
LIB_ILASMFLAGS= $(patsubst %,-I %,$(EXTRA_C_INCL_DIRS)) LIB_ILASMFLAGS = $(patsubst %,-I %,$(EXTRA_C_INCL_DIRS))
# MS_AL is the Microsoft assembly linker, which creates assemblies. # MS_AL is the Microsoft assembly linker, which creates assemblies.
MS_AL = @MS_AL@ MS_AL = @MS_AL@
@@ -247,7 +246,7 @@ CSC = @CSC@
ALL_CSCFLAGS = $(CSCFLAGS) $(EXTRA_CSCFLAGS) $(TARGET_CSCFLAGS) \ ALL_CSCFLAGS = $(CSCFLAGS) $(EXTRA_CSCFLAGS) $(TARGET_CSCFLAGS) \
$(LIB_CSCFLAGS) $(LIB_CSCFLAGS)
CSCFLAGS = CSCFLAGS =
EXTRA_CSCFLAGS = EXTRA_CSCFLAGS =
LIB_CSCFLAGS = LIB_CSCFLAGS =
#-----------------------------------------------------------------------------# #-----------------------------------------------------------------------------#
@@ -671,15 +670,19 @@ INSTALL_MKDIR = mkdir -p
# (e.g. in the shell scripts mmc, ml, mmake, etc) that will not be # (e.g. in the shell scripts mmc, ml, mmake, etc) that will not be
# updated simply by overriding INSTALL_PREFIX. # updated simply by overriding INSTALL_PREFIX.
ifeq ($(origin DESTDIR),undefined)
DESTDIR =
endif
ifeq ($(DESTDIR),) ifeq ($(DESTDIR),)
# DESTDIR is the empty string, DESTDIR_AND_SLASH must therefore be empty. # DESTDIR is the empty string, DESTDIR_AND_SLASH must therefore be empty.
# Otherwise the slash can change a relative path into an absolute one; or # Otherwise the slash can change a relative path into an absolute one; or
# on Windows, it can create an invalid path name. # on Windows, it can create an invalid path name.
DESTDIR_AND_SLASH= DESTDIR_AND_SLASH =
else else
# We cannot append paths like this in Windows, but we don't think anyone # We cannot append paths like this in Windows, but we don't think anyone
# will use DESTDIR on Windows. # will use DESTDIR on Windows.
DESTDIR_AND_SLASH=$(DESTDIR)/ DESTDIR_AND_SLASH = $(DESTDIR)/
endif endif
INSTALL_PREFIX = $(DESTDIR_AND_SLASH)@prefix@ INSTALL_PREFIX = $(DESTDIR_AND_SLASH)@prefix@
@@ -733,8 +736,8 @@ LIBGRADES = @LIBGRADES@
#-----------------------------------------------------------------------------# #-----------------------------------------------------------------------------#
# The command to use to make symlinks, `false' if we shouldn't use # The command to use to make symlinks, `false' if we shouldn't use symlinks
# symlinks (e.g. because Windows executables don't understand them). # (e.g. because Windows executables don't understand them).
LN_S = @LN_S@ LN_S = @LN_S@
#-----------------------------------------------------------------------------# #-----------------------------------------------------------------------------#
@@ -764,6 +767,8 @@ ERR_REDIRECT = > $(*F).err 2>&1
# If this variable is set to no, then mmake doesn't automatically include # If this variable is set to no, then mmake doesn't automatically include
# the ".d" files in the current directory in the Mmakefile. # the ".d" files in the current directory in the Mmakefile.
MMAKE_AUTO_INCLUDE_DS=yes MMAKE_AUTO_INCLUDE_DS = yes
#-----------------------------------------------------------------------------# #-----------------------------------------------------------------------------#
# vim: ts=8 sw=8 noexpandtab ft=make
#-----------------------------------------------------------------------------#

2
tests/valid/Mmake.valid.common
View File

@@ -40,7 +40,7 @@
# The test cases that only work in grades that support tabling. # The test cases that only work in grades that support tabling.
# PAR_CONJ_PROGS: # PAR_CONJ_PROGS:
# The test cases that only work in grades that support parallel conjunction. # The test cases that only work in grades that support parallel conjunction.
# PAR_CONJ_PROGS: # CTGC_PROGS:
# The test cases that only work in grades that support compile-time # The test cases that only work in grades that support compile-time
# garbage collection. Debugging is incompatible with ctgc. # garbage collection. Debugging is incompatible with ctgc.
# RESERVE_TAG_PROGS:: # RESERVE_TAG_PROGS::