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

cs: move build/cs to build/cs/c

Browse Source 
Use "cs/c" to be parallel to the source tree, because making them
different is asking for trouble (e.g., using `configure` without
a separate "build" directory goes wrong).
This commit is contained in:
Matthew Flatt 2019-01-05 18:57:15 -07:00
parent f9c2a9395b
commit edcd1833e7
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -331,8 +331,8 @@ cs-after-racket-with-racket-and-scheme-src:
$(MAKE) cs-after-racket-with-abs-paths RACKET="$(ABS_RACKET)" SCHEME_SRC="$(ABS_SCHEME_SRC)" SELF_UP=../ $(MAKE) cs-after-racket-with-abs-paths RACKET="$(ABS_RACKET)" SCHEME_SRC="$(ABS_SCHEME_SRC)" SELF_UP=../
cs-after-racket-with-abs-paths: cs-after-racket-with-abs-paths:
$(MAKE) racket/src/build/cs/Makefile $(MAKE) racket/src/build/cs/c/Makefile
cd racket/src/build/cs; $(MAKE) RACKET="$(RACKET)" SCHEME_SRC="$(SCHEME_SRC)" MAKE_BUILD_SCHEME="$(MAKE_BUILD_SCHEME)" cd racket/src/build/cs/c; $(MAKE) RACKET="$(RACKET)" SCHEME_SRC="$(SCHEME_SRC)" MAKE_BUILD_SCHEME="$(MAKE_BUILD_SCHEME)"
$(MAKE) base-config $(MAKE) base-config
cd racket/src/build; $(MAKE) install-cs RACKET="$(RACKET)" CS_INSTALLED=$(RACKETCS_SUFFIX) $(INSTALL_SETUP_ARGS) cd racket/src/build; $(MAKE) install-cs RACKET="$(RACKET)" CS_INSTALLED=$(RACKETCS_SUFFIX) $(INSTALL_SETUP_ARGS)
$(MAKE) $(CS_SETUP_TARGET) PLAIN_RACKET=racket/bin/racket$(RACKETCS_SUFFIX) $(MAKE) $(CS_SETUP_TARGET) PLAIN_RACKET=racket/bin/racket$(RACKETCS_SUFFIX)
@ -340,9 +340,9 @@ cs-after-racket-with-abs-paths:
nothing-after-base: nothing-after-base:
echo base done echo base done
racket/src/build/cs/Makefile: racket/src/cs/c/configure racket/src/cs/c/Makefile.in racket/src/cfg-cs racket/src/build/cs/c/Makefile: racket/src/cs/c/configure racket/src/cs/c/Makefile.in racket/src/cfg-cs
mkdir -p cd racket/src/build/cs mkdir -p cd racket/src/build/cs/c
cd racket/src/build/cs; ../../cs/c/configure $(CONFIGURE_ARGS_qq) $(MORE_CONFIGURE_ARGS) cd racket/src/build/cs/c; ../../../cs/c/configure $(CONFIGURE_ARGS_qq) $(MORE_CONFIGURE_ARGS)
$(MAKE) $(CS_CONFIG_TARGET) $(MAKE) $(CS_CONFIG_TARGET)
run-cfg-cs: run-cfg-cs:

6
racket/src/Makefile.in
View File

@ -84,7 +84,7 @@ both:
racketcs: racketcs:
$(MAKE) @CS_BOOTSTRAP_HELP@ $(MAKE) @CS_BOOTSTRAP_HELP@
cd cs; $(MAKE) cd cs/c; $(MAKE)
.PHONY: cs .PHONY: cs
cs: cs:
@ -253,9 +253,9 @@ CS_SETUP_INSTALL_TARGET = setup-install
install-cs-common: install-cs-common:
$(MAKE) install-common-first $(MAKE) install-common-first
cd cs; $(MAKE) plain-install cd cs/c; $(MAKE) plain-install
$(MAKE) install-common-middle $(MAKE) install-common-middle
cd cs; $(MAKE) $(CS_SETUP_INSTALL_TARGET) cd cs/c; $(MAKE) $(CS_SETUP_INSTALL_TARGET)
$(MAKE) install-common-last $(MAKE) install-common-last
install-racketcs: install-racketcs:

2
racket/src/cfg-cs
View File

@ -2186,7 +2186,7 @@ MAKE_GRACKET=no
LIBFINISH=echo LIBFINISH=echo
ICP=cp ICP=cp
RUN_RACKET_CGC="cs/racketcs" RUN_RACKET_CGC="cs/c/racketcs"

6
racket/src/configure vendored
View File

@ -67,13 +67,13 @@ if test "$use_cs" = "yes" ; then
# configuration, so we run it first and let "cfg-cs" or # configuration, so we run it first and let "cfg-cs" or
# "cfg-racket" report that information. # "cfg-racket" report that information.
mkdir -p cs mkdir -p cs/c
case "$dir" in case "$dir" in
/*) /*)
cd cs && "$dir/cs/c/configure" ${1+"$@"} && cd .. cd cs/c && "$dir/cs/c/configure" ${1+"$@"} && cd ../..
;; ;;
*) *)
cd cs && "../$dir/cs/c/configure" ${1+"$@"} && cd .. cd cs/c && "../../$dir/cs/c/configure" ${1+"$@"} && cd ../..
;; ;;
esac esac
fi fi

2
racket/src/cs/c/Makefile.in
View File

@ -19,7 +19,7 @@ LIBS = @LIBS@
STRIP_DEBUG = @STRIP_DEBUG@ STRIP_DEBUG = @STRIP_DEBUG@
STRIP_LIB_DEBUG = @STRIP_LIB_DEBUG@ STRIP_LIB_DEBUG = @STRIP_LIB_DEBUG@
DEFAULT_RACKET = ../racket/racket3m DEFAULT_RACKET = ../../racket/racket3m
RACKET = @RACKET@ RACKET = @RACKET@
CS_INSTALLED = @CS_INSTALLED@ CS_INSTALLED = @CS_INSTALLED@

2
racket/src/cs/c/configure vendored
View File

@ -3861,7 +3861,7 @@ case "$MACH_HOST_CPU" in
;; ;;
esac esac
SCHEME_SRC=../ChezScheme SCHEME_SRC=../../ChezScheme
MAKE_BUILD_SCHEME=y MAKE_BUILD_SCHEME=y
if test "${enable_scheme}" != "" ; then if test "${enable_scheme}" != "" ; then

2
racket/src/cs/c/configure-parent.ac
View File

@ -27,7 +27,7 @@ MAKE_GRACKET=no
LIBFINISH=echo LIBFINISH=echo
ICP=cp ICP=cp
RUN_RACKET_CGC="cs/racketcs" RUN_RACKET_CGC="cs/c/racketcs"
AC_SUBST(ICP) AC_SUBST(ICP)
AC_SUBST(RUN_RACKET_CGC) AC_SUBST(RUN_RACKET_CGC)

2
racket/src/cs/c/configure.ac
View File

@ -263,7 +263,7 @@ case "$MACH_HOST_CPU" in
;; ;;
esac esac
SCHEME_SRC=../ChezScheme SCHEME_SRC=../../ChezScheme
MAKE_BUILD_SCHEME=y MAKE_BUILD_SCHEME=y
if test "${enable_scheme}" != "" ; then if test "${enable_scheme}" != "" ; then