From: Matt Birkholz <puck@birchwood-abbey.net> Date: Wed, 1 Feb 2017 16:45:54 +0000 (-0700) Subject: Merge branch 'master' into Gtk. X-Git-Tag: mit-scheme-pucked-9.2.12~235 X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=e57336e173c3bdbac62e935a12947ce7ca7beb0f;p=mit-scheme.git Merge branch 'master' into Gtk. --- e57336e173c3bdbac62e935a12947ce7ca7beb0f diff --cc src/Makefile.in index e424ca73f,174b060d6..7c8c9d52d --- a/src/Makefile.in +++ b/src/Makefile.in @@@ -61,9 -61,9 +61,9 @@@ mkinstalldirs = $(SHELL) $(top_srcdir)/ # **** END BOILERPLATE **** LIARC_BOOT_BUNDLES = compiler cref sf star-parser -LIARC_BUNDLES = $(LIARC_BOOT_BUNDLES) edwin ffi imail sos ssp xml +LIARC_BUNDLES = $(LIARC_BOOT_BUNDLES) ffi sos ssp xml - SUBDIRS = $(INSTALLED_SUBDIRS) 6001 rcs win32 xdoc + SUBDIRS = $(INSTALLED_SUBDIRS) 6001 win32 xdoc INSTALLED_SUBDIRS = microcode runtime $(LIARC_BUNDLES) MIT_SCHEME_EXE = @MIT_SCHEME_EXE@ @@@ -106,11 -113,16 +109,11 @@@ TOOL_TOOLCHAIN = $(HOST_SCHEME) --band --eval '(begin $(TOOL_COMPILER_SETTINGS))' .PHONY: toolchain - toolchain: tools/compiler.com + toolchain: $(TOOLCHAIN)/compiler.com - tools/compiler.com: + ./tools/compiler.com: $(MAKE) -f Makefile.tools clean && $(MAKE) -f Makefile.tools allclean -# This target toolchain crud is a kludge until the whole system can be -# cross-compiled. Currently only IMAIL can't be. -TARGET_COMPILER_SETTINGS = \ - $(COMPILER_SETTINGS_LIARC) - TARGET_RUNTIME = ./microcode/scheme \ --library lib --band runtime.com --batch-mode TARGET_COMPILER = $(TARGET_RUNTIME) \ diff --cc src/Setup.sh index 5e00cc841,8ace433d1..187e86cbd --- a/src/Setup.sh +++ b/src/Setup.sh @@@ -75,8 -75,8 +75,8 @@@ f . etc/functions.sh -INSTALLED_SUBDIRS="cref edwin ffi imail sf sos ssp star-parser xml" +INSTALLED_SUBDIRS="cref ffi sf sos ssp star-parser xml" - OTHER_SUBDIRS="6001 compiler rcs runtime win32 xdoc microcode" + OTHER_SUBDIRS="6001 compiler runtime win32 xdoc microcode" # lib maybe_mkdir lib diff --cc src/microcode/configure.ac index 09806080c,e30134b52..69fed617f --- a/src/microcode/configure.ac +++ b/src/microcode/configure.ac @@@ -240,12 -276,8 +240,8 @@@ CCLD=${CC MIT_SCHEME_NATIVE_CODE([${enable_native_code}],[${host_cpu}]) - if test x${mit_scheme_native_code} = xhppa; then - GC_HEAD_FILES="${GC_HEAD_FILES} hppacach.h" - fi - -AUXDIR_NAME=mit-scheme-${mit_scheme_native_code} -EXE_NAME=mit-scheme-${mit_scheme_native_code} +AUXDIR_NAME=mit-scheme-pucked +EXE_NAME=mit-scheme-pucked dnl Add OS-dependent customizations. This must happen before checking dnl any headers or library routines, because it may add CFLAGS or