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

makefile: fix cs targets to not break non-cs targets

Browse Source
This commit is contained in:
Matthew Flatt 2020-07-29 12:38:07 -06:00
parent 8a0bb78ab1
commit 7d7b8fb1e9
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -323,7 +323,7 @@ cs-with-configure:
$(MAKE) racket/src/build/cs/c/Makefile $(MAKE) racket/src/build/cs/c/Makefile
cd racket/src/build/cs/c; $(MAKE) cd racket/src/build/cs/c; $(MAKE)
$(MAKE) base-config $(MAKE) base-config
cd racket/src/build; $(MAKE) install-cs CS_INSTALLED=$(RACKETCS_SUFFIX) $(INSTALL_SETUP_ARGS) cd racket/src/build/cs/c; $(MAKE) install CS_INSTALLED=$(RACKETCS_SUFFIX) $(INSTALL_SETUP_ARGS)
$(MAKE) cs-setup$(CS_CROSS_SUFFIX) $(MAKE) cs-setup$(CS_CROSS_SUFFIX)
cs-setup: cs-setup:
@ -335,18 +335,9 @@ cs-setup-cross:
nothing-after-base: nothing-after-base:
echo base done echo base done
CS_CONFIG_TARGET = run-cfg-cs
racket/src/build/cs/c/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/c mkdir -p cd racket/src/build/cs/c
cd racket/src/build/cs/c; ../../../cs/c/configure $(CONFIGURE_ARGS_qq) $(MORE_CONFIGURE_ARGS) $(CONFIG_IN_PLACE_ARGS) cd racket/src/build/cs/c; ../../../cs/c/configure $(CONFIGURE_ARGS_qq) $(MORE_CONFIGURE_ARGS) $(CONFIG_IN_PLACE_ARGS)
$(MAKE) $(CS_CONFIG_TARGET)
run-cfg-cs:
cd racket/src/build; ../cfg-cs $(CONFIGURE_ARGS_qq) $(MORE_CONFIGURE_ARGS) $(CONFIG_IN_PLACE_ARGS)
no-cfg-cs:
echo done
no-fetch-pb: no-fetch-pb:
echo done echo done
@ -443,7 +434,7 @@ both:
$(MAKE) also-cs IN_PLACE_SETUP_OPTIONS="--error-in build/step" $(MAKE) also-cs IN_PLACE_SETUP_OPTIONS="--error-in build/step"
also-cs: also-cs:
$(MAKE) cs CS_SETUP_TARGET=in-place-setup PLT_SETUP_OPTIONS="-D $(PLT_SETUP_OPTIONS)" CS_CONFIG_TARGET=no-cfg-cs $(MAKE) cs CS_SETUP_TARGET=in-place-setup PLT_SETUP_OPTIONS="-D $(PLT_SETUP_OPTIONS)"
win32-both: win32-both:
$(MAKE) win32-in-place $(MAKE) win32-in-place

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

@ -60,7 +60,8 @@ collectsdir = @collectsdir@
configdir = @etcpltdir@ configdir = @etcpltdir@
ALLDIRINFO = "$(DESTDIR)$(bindir)" \ ALLDIRINFO = "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(libpltdir)" "$(DESTDIR)$(libpltdir)" \
"$(DESTDIR)$(includepltdir)"
# Defines FWVERSION: # Defines FWVERSION:
mainsrcdir = @srcdir@/../.. mainsrcdir = @srcdir@/../..

5
racket/src/pkgs-config.rkt
View File

@ -1,7 +1,8 @@
#lang racket/base #lang racket/base
(require racket/cmdline (require racket/cmdline
racket/format racket/format
racket/path) racket/path
racket/file)
;; Adjust the configuration to consult a catalog that is ;; Adjust the configuration to consult a catalog that is
;; expected to map some packages to directory links. ;; expected to map some packages to directory links.
@ -58,6 +59,8 @@
(unless (file-exists? config-file-path) (unless (file-exists? config-file-path)
(printf "Writing ~a\n" config-file-path) (printf "Writing ~a\n" config-file-path)
(let-values ([(base name dir?) (split-path config-file-path)])
(when (path? base) (make-directory* base)))
(call-with-output-file* (call-with-output-file*
config-file-path config-file-path
(lambda (o) (lambda (o)