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

Delete variables for the deleted IL and gcc backends.

Browse Source 
scripts/Mmake.vars.in:
tests/par_conj/Mmakefile:
tests/stm/Mmakefile:
tools/bootcheck:
	As above.
This commit is contained in:
Peter Wang
2015-09-29 17:45:09 +10:00
parent ed3ca2ffe0
commit 9bb1c8caa9
4 changed files with 6 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/Mmake.vars.in
View File

@@ -529,8 +529,6 @@ useds_subdir=$(SUBDIR)useds/
mihs_subdir=$(SUBDIR)mihs/ mihs_subdir=$(SUBDIR)mihs/
cs_subdir=$(SUBDIR)cs/ cs_subdir=$(SUBDIR)cs/
dlls_subdir=$(SUBDIR)dlls/ dlls_subdir=$(SUBDIR)dlls/
ss_subdir=$(SUBDIR)ss/
pic_ss_subdir=$(SUBDIR)pic_ss/
os_subdir=$(SUBDIR)os/ os_subdir=$(SUBDIR)os/
javas_subdir=$(SUBDIR)javas/ javas_subdir=$(SUBDIR)javas/
dirs_subdir=$(SUBDIR)dirs/ dirs_subdir=$(SUBDIR)dirs/
@@ -565,8 +563,6 @@ useds_subdir=
mihs_subdir= mihs_subdir=
cs_subdir= cs_subdir=
dlls_subdir= dlls_subdir=
ss_subdir=
pic_ss_subdir=
os_subdir= os_subdir=
javas_subdir= javas_subdir=
dirs_subdir= dirs_subdir=

17
tests/par_conj/Mmakefile
View File

@@ -104,24 +104,13 @@ endif
# `mmc --make' doesn't expect subdirectories to appear in targets. # `mmc --make' doesn't expect subdirectories to appear in targets.
ifeq ($(MMAKE_USE_MMC_MAKE),yes) ifeq ($(MMAKE_USE_MMC_MAKE),yes)
OS_SUBDIR= OS_SUBDIR=
ILS_SUBDIR=
DLLS_SUBDIR=
else else
OS_SUBDIR=$(os_subdir) OS_SUBDIR=$(os_subdir)
ILS_SUBDIR=$(ils_subdir)
DLLS_SUBDIR=$(dlls_subdir)
endif endif
TARGET_OBJ_EXT=$(O)
ifeq ($(findstring il,$(GRADE)),il) TARGET_OBJ_SUBDIR=$(OS_SUBDIR)
TARGET_OBJ_EXT=dll OBJS = $(OBJ_PROGS:%=$(TARGET_OBJ_SUBDIR)%.$(TARGET_OBJ_EXT))
TARGET_OBJ_SUBDIR=$(DLLS_SUBDIR)
else
TARGET_OBJ_EXT=$(O)
TARGET_OBJ_SUBDIR=$(OS_SUBDIR)
endif
OBJS = $(OBJ_PROGS:%=$(TARGET_OBJ_SUBDIR)%.$(TARGET_OBJ_EXT)) \
$(IL_PROGS:%=$(ILS_SUBDIR)%.il)
#-----------------------------------------------------------------------------# #-----------------------------------------------------------------------------#

16
tests/stm/Mmakefile
View File

@@ -62,23 +62,13 @@ endif
# `mmc --make' doesn't expect subdirectories to appear in targets. # `mmc --make' doesn't expect subdirectories to appear in targets.
ifeq ($(MMAKE_USE_MMC_MAKE),yes) ifeq ($(MMAKE_USE_MMC_MAKE),yes)
OS_SUBDIR = OS_SUBDIR =
ILS_SUBDIR =
DLLS_SUBDIR =
else else
OS_SUBDIR = $(os_subdir) OS_SUBDIR = $(os_subdir)
ILS_SUBDIR = $(ils_subdir)
DLLS_SUBDIR = $(dlls_subdir)
endif endif
ifeq ($(findstring il,$(GRADE)),il) TARGET_OBJ_EXT = $(O)
TARGET_OBJ_EXT = dll TARGET_OBJ_SUBDIR = $(OS_SUBDIR)
TARGET_OBJ_SUBDIR = $(DLLS_SUBDIR) OBJS = $(OBJ_PROGS:%=$(TARGET_OBJ_SUBDIR)%.$(TARGET_OBJ_EXT))
else
TARGET_OBJ_EXT = $(O)
TARGET_OBJ_SUBDIR = $(OS_SUBDIR)
endif
OBJS = $(OBJ_PROGS:%=$(TARGET_OBJ_SUBDIR)%.$(TARGET_OBJ_EXT)) \
$(IL_PROGS:%=$(ILS_SUBDIR)%.il)
#-----------------------------------------------------------------------------# #-----------------------------------------------------------------------------#

4
tools/bootcheck
View File

@@ -434,13 +434,9 @@ fi
case $use_subdirs in case $use_subdirs in
yes) yes)
cs_subdir=Mercury/cs/ cs_subdir=Mercury/cs/
ss_subdir=Mercury/ss/
ils_subdir=Mercury/ils/
;; ;;
no) no)
cs_subdir= cs_subdir=
ss_subdir=
ils_subdir=
;; ;;
esac esac