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

makefile: fix redundant path separators

Browse Source
This commit is contained in:
Matthew Flatt 2018-11-29 10:08:19 -07:00
parent e607ae09de
commit 2e3b16f77c
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
racket/src/cs/absify.rkt
View File

@ -4,6 +4,7 @@
(define same-up? #f) (define same-up? #f)
(define exec? #f) (define exec? #f)
(define no-trailing-sep? #f)
(define-values (orig-p extras) (define-values (orig-p extras)
(command-line (command-line
@ -12,6 +13,8 @@
(set! same-up? #t)] (set! same-up? #t)]
[("--exec") "Find executable path" [("--exec") "Find executable path"
(set! exec? #t)] (set! exec? #t)]
[("--no-trailing-sep") "Avoid a trailing \"/\""
(set! no-trailing-sep? #t)]
#:args #:args
(path . extra) (path . extra)
(values path extra))) (values path extra)))
@ -29,8 +32,14 @@
p) p)
p)) p))
orig-p)) orig-p))
(define (fix-trailing p)
(if no-trailing-sep?
(let-values ([(base name dir?) (split-path p)])
(build-path base name))
p))
(display (simplify-path (path->complete-path p)))]) (display (fix-trailing (simplify-path (path->complete-path p))))])
;; In case there are extra arguments to an executable, preserve them ;; In case there are extra arguments to an executable, preserve them
(for ([e (in-list extras)]) (for ([e (in-list extras)])

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

@ -57,8 +57,8 @@ SETUP_COMMON_BOOT = -l- setup $(SETUP_BOOT_MODE) $(srcdir)/../../setup-go.rkt $(
ABS_BOOT = $(SETUP_COMMON_BOOT) ignored $(builddir)/ignored.d ABS_BOOT = $(SETUP_COMMON_BOOT) ignored $(builddir)/ignored.d
ABS_RACKET = "`$(RACKET) $(ABS_BOOT) $(srcdir)/../absify.rkt --exec $(RACKET)`" ABS_RACKET = "`$(RACKET) $(ABS_BOOT) $(srcdir)/../absify.rkt --exec $(RACKET)`"
ABS_SCHEME_SRC = "`$(RACKET) $(ABS_BOOT) $(srcdir)/../absify.rkt $(SCHEME_SRC)`" ABS_SCHEME_SRC = "`$(RACKET) $(ABS_BOOT) $(srcdir)/../absify.rkt $(SCHEME_SRC)`"
ABS_SRCDIR = "`$(RACKET) $(ABS_BOOT) $(srcdir)/../absify.rkt $(srcdir)`" ABS_SRCDIR = "`$(RACKET) $(ABS_BOOT) $(srcdir)/../absify.rkt --no-trailing-sep $(srcdir)`"
ABS_BUILDDIR = "`$(RACKET) $(ABS_BOOT) $(srcdir)/../absify.rkt $(builddir)`" ABS_BUILDDIR = "`$(RACKET) $(ABS_BOOT) $(srcdir)/../absify.rkt --no-trailing-sep $(builddir)`"
SETUP_BOOT = -O 'info@compiler/cm' $(SETUP_COMMON_BOOT) SETUP_BOOT = -O 'info@compiler/cm' $(SETUP_COMMON_BOOT)