From 616a49ce841a200e018fc87afc755ea95f74a571 Mon Sep 17 00:00:00 2001 From: vyzo Date: Thu, 14 Sep 2023 12:36:44 +0300 Subject: [PATCH 01/15] gxpkg new command --- src/tools/gxpkg.ss | 114 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 101 insertions(+), 13 deletions(-) diff --git a/src/tools/gxpkg.ss b/src/tools/gxpkg.ss index 0c550054a..e58251fb0 100644 --- a/src/tools/gxpkg.ss +++ b/src/tools/gxpkg.ss @@ -28,6 +28,7 @@ :std/pregexp :std/net/request :std/misc/process + :std/misc/template (only-in :std/srfi/13 string-trim) :gerbil/gambit/os :gerbil/gambit/exceptions) @@ -67,7 +68,15 @@ (rest-arguments 'pkg help: "package to build; all for all packages"))) (def clean-cmd (command 'clean help: "clean compilation artefacts from one or more packages" - (rest-arguments 'pkg help: "package to clean"))) + (rest-arguments 'pkg help: "package to clean"))) + (def new-cmd + (command 'new help: "Create a new package template in the current directory" + (option 'package "-p" "--package" + help: "The package prefix for your project; defaults to the current username" + default: (getenv "USER")) + (option 'name "-n" "--name" + help: "The package name; defaults to the current directory name" + default: (path-strip-directory (current-directory))))) (def list-cmd (command 'list help: "list installed packages")) (def retag-cmd @@ -79,13 +88,14 @@ (call-with-getopt gxpkg-main args program: "gxpkg" help: "The Gerbil Package Manager" + new-cmd + build-cmd + clean-cmd + link-cmd + unlink-cmd install-cmd uninstall-cmd update-cmd - link-cmd - unlink-cmd - build-cmd - clean-cmd list-cmd retag-cmd search-cmd)) @@ -93,20 +103,22 @@ (def (gxpkg-main cmd opt) (let-hash opt (case cmd + ((new) + (new-pkg .package .name)) + ((build) + (build-pkgs .pkg .?release .?optimized)) + ((clean) + (clean-pkgs .pkg)) + ((link) + (link-pkg .pkg .src)) + ((unlink) + (unlink-pkgs .pkg .?force)) ((install) (install-pkgs .pkg)) ((uninstall) (uninstall-pkgs .pkg .?force)) ((update) (update-pkgs .pkg)) - ((link) - (link-pkg .pkg .src)) - ((unlink) - (unlink-pkgs .pkg .?force)) - ((build) - (build-pkgs .pkg .?release .?optimized)) - ((clean) - (clean-pkgs .pkg)) ((list) (list-pkgs)) ((retag) @@ -206,6 +218,24 @@ (force once) +pkg-root-dir+))) +(def (pkg-new prefix name) + (def (create-template file template . args) + (call-with-output-file file + (lambda (output) + (apply write-template template output args)))) + + (create-template "gerbil.pkg" gerbi.pkg-template + package: prefix) + (create-directory "bin") + (create-directory name) + (create-template (path-expand "main.ss" name) main.ss-template + name: name) + (create-template (path-expand "lib.ss" name) lib.ss-template) + (create-template [path: "build.ss" permissions: #o755] build.ss-template + name: name) + ;; TODO create Makefile template + ) + (def (pkg-install pkg) (def (git-clone-url pkg) (string-append "https://" pkg ".git")) @@ -487,3 +517,61 @@ (def (file-symbolic-link? path) (eq? (file-info-type (file-info path #f)) 'symbolic-link)) + +;;; templates +(def gerbil.pkg-template #< Date: Thu, 14 Sep 2023 12:39:50 +0300 Subject: [PATCH 02/15] add automatic package linking to pkg-new --- src/tools/gxpkg.ss | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/tools/gxpkg.ss b/src/tools/gxpkg.ss index e58251fb0..8949f5d21 100644 --- a/src/tools/gxpkg.ss +++ b/src/tools/gxpkg.ss @@ -76,7 +76,9 @@ default: (getenv "USER")) (option 'name "-n" "--name" help: "The package name; defaults to the current directory name" - default: (path-strip-directory (current-directory))))) + default: (path-strip-directory (current-directory))) + (option 'name "-l" "--link" + help: "Link this package with a package name; for example: github.com/your-user/your-package"))) (def list-cmd (command 'list help: "list installed packages")) (def retag-cmd @@ -104,7 +106,7 @@ (let-hash opt (case cmd ((new) - (new-pkg .package .name)) + (new-pkg .package .name .link)) ((build) (build-pkgs .pkg .?release .?optimized)) ((clean) @@ -218,7 +220,7 @@ (force once) +pkg-root-dir+))) -(def (pkg-new prefix name) +(def (pkg-new prefix name maybe-link) (def (create-template file template . args) (call-with-output-file file (lambda (output) @@ -234,7 +236,9 @@ (create-template [path: "build.ss" permissions: #o755] build.ss-template name: name) ;; TODO create Makefile template - ) + ;; ... + (when maybe-link + (pkg-link maybe-link (current-directory)))) (def (pkg-install pkg) (def (git-clone-url pkg) From 0de4761874d4dba6ac426eab2e53dc9c98ad4c4d Mon Sep 17 00:00:00 2001 From: vyzo Date: Thu, 14 Sep 2023 12:41:37 +0300 Subject: [PATCH 03/15] improve link option help --- src/tools/gxpkg.ss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/gxpkg.ss b/src/tools/gxpkg.ss index 8949f5d21..3ef456f4f 100644 --- a/src/tools/gxpkg.ss +++ b/src/tools/gxpkg.ss @@ -78,7 +78,7 @@ help: "The package name; defaults to the current directory name" default: (path-strip-directory (current-directory))) (option 'name "-l" "--link" - help: "Link this package with a package name; for example: github.com/your-user/your-package"))) + help: "Optionally link this package with a public package name; for example: github.com/your-user/your-package"))) (def list-cmd (command 'list help: "list installed packages")) (def retag-cmd From 47a8d479e372056d27d330b30be43d7c169dbe07 Mon Sep 17 00:00:00 2001 From: vyzo Date: Thu, 14 Sep 2023 12:44:27 +0300 Subject: [PATCH 04/15] fix reference --- src/tools/gxpkg.ss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/gxpkg.ss b/src/tools/gxpkg.ss index 3ef456f4f..70ce7db20 100644 --- a/src/tools/gxpkg.ss +++ b/src/tools/gxpkg.ss @@ -106,7 +106,7 @@ (let-hash opt (case cmd ((new) - (new-pkg .package .name .link)) + (pkg-new .package .name .link)) ((build) (build-pkgs .pkg .?release .?optimized)) ((clean) @@ -226,7 +226,7 @@ (lambda (output) (apply write-template template output args)))) - (create-template "gerbil.pkg" gerbi.pkg-template + (create-template "gerbil.pkg" gerbil.pkg-template package: prefix) (create-directory "bin") (create-directory name) From 7129d8e147edfe77b635cd071befdfe1ac6c830e Mon Sep 17 00:00:00 2001 From: vyzo Date: Thu, 14 Sep 2023 12:49:37 +0300 Subject: [PATCH 05/15] add gxpkg new synonym to bach --- src/gerbil/main.ss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gerbil/main.ss b/src/gerbil/main.ss index 4e4d974ee..984c49d72 100644 --- a/src/gerbil/main.ss +++ b/src/gerbil/main.ss @@ -64,7 +64,8 @@ package: gerbil ("interactive" . "gxi"))) (def builtin-tools-subcommand-synonyms - '(("build" "gxpkg" "build"))) + '(("new" "gxkpg" "new") + ("build" "gxpkg" "build"))) (def (print-usage! program-name) (displayln "Usage: " program-name " [option ...] arguments ...") @@ -80,6 +81,7 @@ package: gerbil (displayln "Builtin Tools:") (displayln " interactive the gerbil interpreter (gxi)") (displayln " compile the gerbil compiler (gxc)") + (displayln " new the gerbil package template tool (gxpkg new)") (displayln " build the gerbil build tool (gxkpg build)") (displayln " pkg the gerbil package manager (gxpkg)") (displayln " test the gerbil test runner (gxtest)") From 0a60079398995d71e6bba8216d0ec6dd1e393d35 Mon Sep 17 00:00:00 2001 From: vyzo Date: Thu, 14 Sep 2023 13:13:26 +0300 Subject: [PATCH 06/15] fix bugz --- src/tools/gxpkg.ss | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/tools/gxpkg.ss b/src/tools/gxpkg.ss index 70ce7db20..ea6fedc61 100644 --- a/src/tools/gxpkg.ss +++ b/src/tools/gxpkg.ss @@ -76,8 +76,10 @@ default: (getenv "USER")) (option 'name "-n" "--name" help: "The package name; defaults to the current directory name" - default: (path-strip-directory (current-directory))) - (option 'name "-l" "--link" + default: (path-strip-directory + (let (path (path-normalize (current-directory))) + (substring path 0 (1- (string-length path)))))) + (option 'link "-l" "--link" help: "Optionally link this package with a public package name; for example: github.com/your-user/your-package"))) (def list-cmd (command 'list help: "list installed packages")) @@ -228,7 +230,6 @@ (create-template "gerbil.pkg" gerbil.pkg-template package: prefix) - (create-directory "bin") (create-directory name) (create-template (path-expand "main.ss" name) main.ss-template name: name) @@ -525,6 +526,7 @@ ;;; templates (def gerbil.pkg-template #< Date: Thu, 14 Sep 2023 13:13:37 +0300 Subject: [PATCH 07/15] bach: refactor tool command dispatch --- src/gerbil/main.ss | 56 +++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 31 deletions(-) diff --git a/src/gerbil/main.ss b/src/gerbil/main.ss index 984c49d72..0dd51f2f1 100644 --- a/src/gerbil/main.ss +++ b/src/gerbil/main.ss @@ -52,20 +52,17 @@ package: gerbil "gerbil/compiler/ssxi" "gerbil/compiler")) -(def builtin-tools - '("pkg" - "test" - "tags" - "prof" - "ensemble")) - -(def builtin-tools-synonyms - '(("compile" . "gxc") - ("interactive" . "gxi"))) - -(def builtin-tools-subcommand-synonyms - '(("new" "gxkpg" "new") - ("build" "gxpkg" "build"))) +(def builtin-tool-commands + '(("new" "gxkpg" "new") + ("build" "gxpkg" "build") + ("clean" "gxpkg" "clean") + ("pkg" "gxkpg") + ("test" "gxtest") + ("tags" "gxtags") + ("prof" "gxprof") + ("ensemble" "gxensemble") + ("interactive" "gxi") + ("compile" "gxc"))) (def (print-usage! program-name) (displayln "Usage: " program-name " [option ...] arguments ...") @@ -75,19 +72,20 @@ package: gerbil (displayln " -v|--version|version display the system version and exit") (displayln) (displayln "Arguments: ") - (displayln " tool-arg ... execute a builtin gerbil tool") + (displayln " cmd-arg ... execute a builtin tool command") (displayln " arg ... drop to the gerbil interpreter") (displayln) - (displayln "Builtin Tools:") - (displayln " interactive the gerbil interpreter (gxi)") - (displayln " compile the gerbil compiler (gxc)") - (displayln " new the gerbil package template tool (gxpkg new)") - (displayln " build the gerbil build tool (gxkpg build)") - (displayln " pkg the gerbil package manager (gxpkg)") - (displayln " test the gerbil test runner (gxtest)") - (displayln " tags the gerbil tag generator (gxtags)") - (displayln " prof the gerbil profiler (gxprof)") - (displayln " ensemble the gerbil actor ensemble manager (gxensemble)") + (displayln "Commands:") + (displayln " new create a new project template (gxpkg new)") + (displayln " build build a gerbil package (gxkpg build)") + (displayln " clean clean build artifactacts for a package (gxpkg clean)") + (displayln " pkg invoke the gerbil package manager (gxpkg)") + (displayln " test run tests (gxtest)") + (displayln " tags create emacs tags (gxtags)") + (displayln " prof profile a dynamic executable module (gxprof)") + (displayln " ensemble invoke the gerbil actor ensemble manager (gxensemble)") + (displayln " interactive invoke the gerbil interpreter (gxi)") + (displayln " compile invoke the gerbil compiler (gxc)") (displayln) (displayln "Try " program-name " [-h|--help|help] for help on tool usage" )) @@ -190,12 +188,8 @@ package: gerbil (match args ([hd . rest] (cond - ((member hd builtin-tools) - (tool-main (string-append "gx" hd) rest)) - ((assoc hd builtin-tools-synonyms) - => (lambda (p) (tool-main (cdr p) rest))) - ((assoc hd builtin-tools-subcommand-synonyms) - => (lambda (sub) (tool-main (cadr sub) (append (cdr sub) rest)))) + ((assoc hd builtin-tool-commands) + => (lambda (cmd) (tool-main (cadr cmd) (append (cdr cmd) rest)))) ((member hd '("-h" "--help" "help")) (print-usage! program-name)) ((member hd '("-v" "--version" "version")) From 41032061e1c45968bd657f02685b0b3c3949bf0b Mon Sep 17 00:00:00 2001 From: vyzo Date: Thu, 14 Sep 2023 13:32:45 +0300 Subject: [PATCH 08/15] add proper tool help to bach --- src/gerbil/main.ss | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/src/gerbil/main.ss b/src/gerbil/main.ss index 0dd51f2f1..8532654af 100644 --- a/src/gerbil/main.ss +++ b/src/gerbil/main.ss @@ -64,11 +64,23 @@ package: gerbil ("interactive" "gxi") ("compile" "gxc"))) +(def builtin-tool-help + '(("new" "gxkpg" "help" "new") + ("build" "gxpkg" "help" "build") + ("clean" "gxpkg" "help" "clean") + ("pkg" "gxkpg" "help") + ("test" "gxtest" "-h") + ("tags" "gxtags" "-h") + ("prof" "gxprof" "-h") + ("ensemble" "gxensemble" "help") + ("interactive" "gxi" "-h") + ("compile" "gxc" "-h"))) + (def (print-usage! program-name) (displayln "Usage: " program-name " [option ...] arguments ...") (displayln) (displayln "Options: ") - (displayln " -h|--help|help display this help message exit") + (displayln " -h|--help display this help message exit") (displayln " -v|--version|version display the system version and exit") (displayln) (displayln "Arguments: ") @@ -86,8 +98,9 @@ package: gerbil (displayln " ensemble invoke the gerbil actor ensemble manager (gxensemble)") (displayln " interactive invoke the gerbil interpreter (gxi)") (displayln " compile invoke the gerbil compiler (gxc)") + (displayln " help display help for a tool command") (displayln) - (displayln "Try " program-name " [-h|--help|help] for help on tool usage" )) + (displayln "Try " program-name " help for help on tool command usage" )) (extern namespace: #f gerbil-runtime-init!) @@ -188,10 +201,21 @@ package: gerbil (match args ([hd . rest] (cond + ((member hd '("-h" "--help")) + (print-usage! program-name)) + ((equal? "help" hd) + (match rest + ([cmd . rest] + (cond + ((assoc cmd builtin-tool-help) + => (lambda (help-cmd) (tool-main (cadr help-cmd) (cdr help-cmd) rest))) + (else + (displayln "no help for topic " cmd) + (print-usage! program-name)))) + (else + (print-usage! program-name)))) ((assoc hd builtin-tool-commands) => (lambda (cmd) (tool-main (cadr cmd) (append (cdr cmd) rest)))) - ((member hd '("-h" "--help" "help")) - (print-usage! program-name)) ((member hd '("-v" "--version" "version")) (displayln (gerbil-system-version-string))) (else From 79b735aca69b51d2f87a3e9f99a01d028feab679 Mon Sep 17 00:00:00 2001 From: vyzo Date: Thu, 14 Sep 2023 13:42:28 +0300 Subject: [PATCH 09/15] fix tool-main application --- src/gerbil/main.ss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gerbil/main.ss b/src/gerbil/main.ss index 8532654af..952956317 100644 --- a/src/gerbil/main.ss +++ b/src/gerbil/main.ss @@ -205,17 +205,17 @@ package: gerbil (print-usage! program-name)) ((equal? "help" hd) (match rest - ([cmd . rest] + ([cmd] (cond ((assoc cmd builtin-tool-help) - => (lambda (help-cmd) (tool-main (cadr help-cmd) (cdr help-cmd) rest))) + => (lambda (help-cmd) (tool-main (car help-cmd) (cdr help-cmd)))) (else (displayln "no help for topic " cmd) (print-usage! program-name)))) (else (print-usage! program-name)))) ((assoc hd builtin-tool-commands) - => (lambda (cmd) (tool-main (cadr cmd) (append (cdr cmd) rest)))) + => (lambda (cmd) (tool-main (car cmd) (append (cdr cmd) rest)))) ((member hd '("-v" "--version" "version")) (displayln (gerbil-system-version-string))) (else From 627ad55c1505a4f26afa680bc9a37bbb1476b985 Mon Sep 17 00:00:00 2001 From: vyzo Date: Thu, 14 Sep 2023 13:44:15 +0300 Subject: [PATCH 10/15] improve gxpkg build and clean help --- src/tools/gxpkg.ss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/gxpkg.ss b/src/tools/gxpkg.ss index ea6fedc61..235b55902 100644 --- a/src/tools/gxpkg.ss +++ b/src/tools/gxpkg.ss @@ -65,10 +65,10 @@ (command 'build help: "rebuild one or more packages and their dependents" (flag 'build-release "-R" "--release" help: "build released (static) executables") (flag 'build-optimized "-O" "--optimized" help: "build full program optimized executables") - (rest-arguments 'pkg help: "package to build; all for all packages"))) + (rest-arguments 'pkg help: "package to build; all for all packages, omit to build in current directory"))) (def clean-cmd (command 'clean help: "clean compilation artefacts from one or more packages" - (rest-arguments 'pkg help: "package to clean"))) + (rest-arguments 'pkg help: "package to clean; all for all packages, omit to clean in current directory"))) (def new-cmd (command 'new help: "Create a new package template in the current directory" (option 'package "-p" "--package" From 217bd7bc888230770e8f4b04f352bc0ff26ca891 Mon Sep 17 00:00:00 2001 From: vyzo Date: Thu, 14 Sep 2023 13:50:30 +0300 Subject: [PATCH 11/15] add gitignore to project template --- src/tools/gxpkg.ss | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/tools/gxpkg.ss b/src/tools/gxpkg.ss index 235b55902..460e5c689 100644 --- a/src/tools/gxpkg.ss +++ b/src/tools/gxpkg.ss @@ -236,8 +236,11 @@ (create-template (path-expand "lib.ss" name) lib.ss-template) (create-template [path: "build.ss" permissions: #o755] build.ss-template name: name) + (create-template ".gitignore" gitignore-template) + ;; TODO create Makefile template ;; ... + (when maybe-link (pkg-link maybe-link (current-directory)))) @@ -584,3 +587,10 @@ END END ) + +(def gitignore-template #< Date: Thu, 14 Sep 2023 14:02:55 +0300 Subject: [PATCH 12/15] nope, fix again --- src/gerbil/main.ss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gerbil/main.ss b/src/gerbil/main.ss index 952956317..8f1ce9f92 100644 --- a/src/gerbil/main.ss +++ b/src/gerbil/main.ss @@ -208,14 +208,14 @@ package: gerbil ([cmd] (cond ((assoc cmd builtin-tool-help) - => (lambda (help-cmd) (tool-main (car help-cmd) (cdr help-cmd)))) + => (lambda (help-cmd) (tool-main (cadr help-cmd) (cdr help-cmd)))) (else (displayln "no help for topic " cmd) (print-usage! program-name)))) (else (print-usage! program-name)))) ((assoc hd builtin-tool-commands) - => (lambda (cmd) (tool-main (car cmd) (append (cdr cmd) rest)))) + => (lambda (cmd) (tool-main (cadr cmd) (append (cdr cmd) rest)))) ((member hd '("-v" "--version" "version")) (displayln (gerbil-system-version-string))) (else From d5d6682d53d2d2f257f92ad414af648756503889 Mon Sep 17 00:00:00 2001 From: vyzo Date: Thu, 14 Sep 2023 14:39:55 +0300 Subject: [PATCH 13/15] use cddr --- src/gerbil/main.ss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gerbil/main.ss b/src/gerbil/main.ss index 8f1ce9f92..afc2c79fe 100644 --- a/src/gerbil/main.ss +++ b/src/gerbil/main.ss @@ -56,7 +56,7 @@ package: gerbil '(("new" "gxkpg" "new") ("build" "gxpkg" "build") ("clean" "gxpkg" "clean") - ("pkg" "gxkpg") + ("pkg" "gxpkg") ("test" "gxtest") ("tags" "gxtags") ("prof" "gxprof") @@ -208,14 +208,14 @@ package: gerbil ([cmd] (cond ((assoc cmd builtin-tool-help) - => (lambda (help-cmd) (tool-main (cadr help-cmd) (cdr help-cmd)))) + => (lambda (help-cmd) (tool-main (cadr help-cmd) (cddr help-cmd)))) (else (displayln "no help for topic " cmd) (print-usage! program-name)))) (else (print-usage! program-name)))) ((assoc hd builtin-tool-commands) - => (lambda (cmd) (tool-main (cadr cmd) (append (cdr cmd) rest)))) + => (lambda (cmd) (tool-main (cadr cmd) (append (cddr cmd) rest)))) ((member hd '("-v" "--version" "version")) (displayln (gerbil-system-version-string))) (else From 04f87b8cd238ba30200b828549c4cb1f32e4b6e1 Mon Sep 17 00:00:00 2001 From: vyzo Date: Thu, 14 Sep 2023 14:59:50 +0300 Subject: [PATCH 14/15] fukin typos --- src/gerbil/main.ss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gerbil/main.ss b/src/gerbil/main.ss index afc2c79fe..58e2dd1cb 100644 --- a/src/gerbil/main.ss +++ b/src/gerbil/main.ss @@ -53,7 +53,7 @@ package: gerbil "gerbil/compiler")) (def builtin-tool-commands - '(("new" "gxkpg" "new") + '(("new" "gxpkg" "new") ("build" "gxpkg" "build") ("clean" "gxpkg" "clean") ("pkg" "gxpkg") @@ -65,10 +65,10 @@ package: gerbil ("compile" "gxc"))) (def builtin-tool-help - '(("new" "gxkpg" "help" "new") + '(("new" "gxpkg" "help" "new") ("build" "gxpkg" "help" "build") ("clean" "gxpkg" "help" "clean") - ("pkg" "gxkpg" "help") + ("pkg" "gxpkg" "help") ("test" "gxtest" "-h") ("tags" "gxtags" "-h") ("prof" "gxprof" "-h") @@ -89,7 +89,7 @@ package: gerbil (displayln) (displayln "Commands:") (displayln " new create a new project template (gxpkg new)") - (displayln " build build a gerbil package (gxkpg build)") + (displayln " build build a gerbil package (gxpkg build)") (displayln " clean clean build artifactacts for a package (gxpkg clean)") (displayln " pkg invoke the gerbil package manager (gxpkg)") (displayln " test run tests (gxtest)") From 08fdbbf188afd9daa3bfd3363cc86eeae8d070b0 Mon Sep 17 00:00:00 2001 From: vyzo Date: Thu, 14 Sep 2023 15:04:27 +0300 Subject: [PATCH 15/15] fix clown shoes in --enable-target spec not that it broke anything, but it was funky. --- configure | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 3fc1871ae..d73732f10 100755 --- a/configure +++ b/configure @@ -61,8 +61,9 @@ std_disable_feature() { } readonly gerbil_version="v$(git describe --tags --always)" +readonly gerbil_targets="" readonly default_gambit_tag=v4.9.5 -readonly default_gambit_config="--enable-targets='' --enable-single-host --enable-dynamic-clib --enable-default-runtime-options=t8,f8,-8 --enable-trust-c-tco" +readonly default_gambit_config="--enable-targets=${gerbil_targets} --enable-single-host --enable-dynamic-clib --enable-default-runtime-options=t8,f8,-8 --enable-trust-c-tco" prefix="/opt/gerbil" readonly cflags_opt="-foptimize-sibling-calls" readonly ldflags_rpath="-Wl,-rpath"