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

launcher: fix use of variant suffix

Browse Source 
Repairs builds where only "racketbc" is installed (not "racket"), for
example.
This commit is contained in:
Matthew Flatt 2021-05-19 09:04:23 -06:00
parent a40bfc5204
commit 5b163e3152
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
racket/collects/launcher/launcher.rkt
View File

@ -394,13 +394,14 @@
[alt-exe-is-gracket? (and alt-exe [alt-exe-is-gracket? (and alt-exe
(let ([m (assq 'exe-is-gracket aux)]) (let ([m (assq 'exe-is-gracket aux)])
(and m (cdr m))))] (and m (cdr m))))]
[use-exe (or alt-exe (case kind [use-exe (or alt-exe
(case kind
[(mred) (if (eq? 'macosx (cross-system-type)) [(mred) (if (eq? 'macosx (cross-system-type))
(format "GRacket~a.app/Contents/MacOS/Gracket~a" (format "GRacket~a.app/Contents/MacOS/Gracket~a"
(variant-suffix variant #t) (variant-suffix variant #t)
(variant-suffix variant #t)) (variant-suffix variant #t))
"gracket")] (string-append "gracket" (variant-suffix variant #f)))]
[(mzscheme) "racket"]))] [(mzscheme) (string-append "racket" (variant-suffix variant #f))]))]
[x-flags? (and (eq? kind 'mred) [x-flags? (and (eq? kind 'mred)
(eq? (cross-system-type) 'unix) (eq? (cross-system-type) 'unix)
(not (script-variant? variant)))] (not (script-variant? variant)))]
@ -465,12 +466,8 @@
(make-relative-path-header dest bindir) (make-relative-path-header dest bindir)
(make-absolute-path-header bindir))] (make-absolute-path-header bindir))]
[exec (format [exec (format
"exec \"${bindir}/~a~a\" ~a" "exec \"${bindir}/~a\" ~a"
use-exe use-exe
(if alt-exe
""
(variant-suffix variant (and (eq? kind 'mred)
(eq? 'macosx (cross-system-type)))))
pre-str)] pre-str)]
[args (format [args (format
"~a~a ${1+\"$@\"}\n" "~a~a ${1+\"$@\"}\n"