fix build --release and --optimized (#850)

Typo in the hash get; also made them options for the build script.

src/std/build-script.ss

@@ -7,15 +7,29 @@
 (export defbuild-script)
 
 (def (build-main args build-spec keys that-file)
-  (def srcdir (path-normalize (path-directory that-file)))
-  (def (build) (apply make build-spec srcdir: srcdir keys))
-  (def (clean) (apply make-clean build-spec srcdir: srcdir keys))
+  (def (parse-options opts)
+    (let lp ((rest opts) (options []))
+      (match rest
+        ([] options)
+        (["--release" . rest]
+         (lp rest (cons* build-release: #t options)))
+        (["--optimized" . rest]
+         (lp rest (cons* build-optimized: #t options)))
+        (else
+         (error "Unexpected " rest)))))
+  (def srcdir
+    (path-normalize (path-directory that-file)))
+  (def (build options)
+    (apply make build-spec srcdir: srcdir (append options keys)))
+  (def (clean)
+    (apply make-clean build-spec srcdir: srcdir keys))
+
   (match args
     (["meta"] (write '("spec" "compile" "clean")) (newline))
     (["spec"] (pretty-print build-spec))
-    (["compile"] (build))
+    (["compile" . options] (build (parse-options options)))
     (["clean"] (clean))
-    ([] (build))))
+    ([] (build []))))
 
 (defsyntax (defbuild-script stx)
   (syntax-case stx ()

src/tools/gxpkg.ss

@@ -110,7 +110,7 @@
       ((new)
        (pkg-new .package .name .link))
       ((build)
-       (build-pkgs .pkg .?release .?optimized))
+       (build-pkgs .pkg .?build-release .?build-optimized))
       ((clean)
        (clean-pkgs .pkg))
       ((link)
@@ -344,6 +344,16 @@
       (delete-file dest))))
 
 (def (pkg-build pkg (dependents? #t))
+  (def build-options
+    (let* ((options [])
+           (options (if (getenv "GERBIL_BUILD_RELEASE" #f)
+                      (cons "--release" options)
+                      options))
+           (options (if (getenv "GERBIL_BUILD_OPTIMIZED" #f)
+                      (cons "--optimized" options)
+                      options)))
+      options))
+
   (cond
    ((equal? pkg "all")
     (let* ((pkgs (pkg-list))
@@ -354,7 +364,7 @@
    ((equal? pkg ".")
     (displayln "... build in current directory")
     (let (build.ss (path-expand "build.ss" (current-directory)))
-      (run-process [build.ss "compile"]
+      (run-process [build.ss "compile" build-options ...]
                    stdout-redirection: #f)))
    (else
      (let* ((root (pkg-root-dir))
@@ -363,7 +373,7 @@
                  (error "Cannot build unknown package" pkg)))
             (build.ss (pkg-build-script pkg)))
        (displayln "... build " pkg)
-       (run-process [build.ss "compile"]
+       (run-process [build.ss "compile" build-options ...]
                     directory: path
                     coprocess: void
                     stdout-redirection: #f)