suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

makefile: configure with --enable-racket => no 3m dependency CS

Browse Source 
Adjust the makefile that ends up in <builddir> with `--enable-cs` or
`--enable-csdefault` (as opposed to `--enable-csonly`) so that `make
racketcs` doesn't imply `make racket3m` if `--enable-racket` has
supplied an existing Racket.

Also fix `make install-cs` related to GRacket for the case that Racket
3m/CGC isn't built.

Relevant to #2683
This commit is contained in:
Matthew Flatt 2019-06-05 06:43:28 -06:00
parent eec118f4fb
commit edd74d6ecf
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
racket/src/Makefile.in
View File

@ -134,9 +134,11 @@ install-common-first:
esac esac
mkdir -p $(ALLDIRINFO) mkdir -p $(ALLDIRINFO)
MIDDLE_POST_COLLECTS = install-@MAKE_GRACKET@-post-collects
install-common-middle: install-common-middle:
$(MAKE) @MAKE_COPYTREE@-run $(MAKE) @MAKE_COPYTREE@-run
$(MAKE) install-@MAKE_GRACKET@-post-collects $(MAKE) $(MIDDLE_POST_COLLECTS)
$(MAKE) lib-finish $(MAKE) lib-finish
install-common-last: install-common-last:
@ -259,7 +261,7 @@ CS_SETUP_INSTALL_TARGET = setup-install
install-cs-common: install-cs-common:
$(MAKE) install-common-first $(MAKE) install-common-first
cd cs/c; $(MAKE) plain-install cd cs/c; $(MAKE) plain-install
$(MAKE) install-common-middle $(MAKE) install-common-middle MIDDLE_POST_COLLECTS=install-no-post-collects
cd cs/c; $(MAKE) $(CS_SETUP_INSTALL_TARGET) cd cs/c; $(MAKE) $(CS_SETUP_INSTALL_TARGET)
$(MAKE) install-common-last $(MAKE) install-common-last

7
racket/src/cfg-racket
View File

@ -5054,7 +5054,12 @@ if test "${enable_cgcdefault}" ; then
MAIN_VARIANT=cgc MAIN_VARIANT=cgc
fi fi
MAIN_MAKE_TARGET="${MAIN_VARIANT}" MAIN_MAKE_TARGET="${MAIN_VARIANT}"
CS_BOOTSTRAP_HELP="${MAIN_VARIANT}"
if test "${enable_racket}" = "" ; then
CS_BOOTSTRAP_HELP="${MAIN_VARIANT}"
else
CS_BOOTSTRAP_HELP="no-${MAIN_VARIANT}"
fi
if test "${enable_csdefault}" ; then if test "${enable_csdefault}" ; then
MMM_INSTALLED=3m MMM_INSTALLED=3m

7
racket/src/racket/configure.ac
View File

@ -769,7 +769,12 @@ if test "${enable_cgcdefault}" ; then
MAIN_VARIANT=cgc MAIN_VARIANT=cgc
fi fi
MAIN_MAKE_TARGET="${MAIN_VARIANT}" MAIN_MAKE_TARGET="${MAIN_VARIANT}"
CS_BOOTSTRAP_HELP="${MAIN_VARIANT}"
if test "${enable_racket}" = "" ; then
CS_BOOTSTRAP_HELP="${MAIN_VARIANT}"
else
CS_BOOTSTRAP_HELP="no-${MAIN_VARIANT}"
fi
if test "${enable_csdefault}" ; then if test "${enable_csdefault}" ; then
MMM_INSTALLED=3m MMM_INSTALLED=3m