configure: Do not use GUILD_OPTIMIZE=-O1 for Guile-2.

This is a follow-up to

    a0560aff67
    configure: Use GUILD_OPTIMIZE=-O1 for Guile-3.

and fixes using Guile-2.0.x, which does not support -O1.

Reported by W. J. van der Laan <laanwj@protonmail.com>.

* configure (main): Check for Guile > 2.9.x to set optimization.
This commit is contained in:
Jan (janneke) Nieuwenhuizen 2021-04-26 06:55:27 +02:00
parent 6c1ff75c5a
commit 0a9c8f92cb
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273

4
configure vendored
View file

@ -4,7 +4,7 @@ MES_ARENA=100000000 exec ${SCHEME-guile} -L . --no-auto-compile -e '(configure)'
!# !#
;;; GNU Mes --- Maxwell Equations of Software ;;; GNU Mes --- Maxwell Equations of Software
;;; Copyright © 2016,2017,2018,2019,2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016,2017,2018,2019,2020,2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; ;;;
;;; configure: This file is part of GNU Mes. ;;; configure: This file is part of GNU Mes.
;;; ;;;
@ -479,7 +479,7 @@ Some influential environment variables:
(guile (file-name "guile" deps)) (guile (file-name "guile" deps))
;; See https://bugs.gnu.org/43831; use -O1 with Guile-3 ;; See https://bugs.gnu.org/43831; use -O1 with Guile-3
(guild-optimize (let ((guile-version (and=> (find-dep "guile" deps) dependency-version-found))) (guild-optimize (let ((guile-version (and=> (find-dep "guile" deps) dependency-version-found)))
(and guile-version (tuple< '(2) guile-version) "-O1"))) (and guile-version (tuple< '(2 9) guile-version) "-O1")))
(deps (if guile (cons (check-program-version (make-dep "nyacc" #:version '(0 99 0) #:commands (list (string-append guile " -c '(use-modules (nyacc lalr)) (display *nyacc-version*)'")) #:file-name #t #:version-option #f)) (deps (if guile (cons (check-program-version (make-dep "nyacc" #:version '(0 99 0) #:commands (list (string-append guile " -c '(use-modules (nyacc lalr)) (display *nyacc-version*)'")) #:file-name #t #:version-option #f))
deps) deps)
deps)) deps))