From 0a9c8f92cb7d19be49b1bf53718f8df59670315e Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 26 Apr 2021 06:55:27 +0200 Subject: [PATCH] configure: Do not use GUILD_OPTIMIZE=-O1 for Guile-2. This is a follow-up to a0560aff676b0fe8d7d50b365a75ed158347eb3a 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 . * configure (main): Check for Guile > 2.9.x to set optimization. --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index e071a466..1d1a1a82 100755 --- a/configure +++ b/configure @@ -4,7 +4,7 @@ MES_ARENA=100000000 exec ${SCHEME-guile} -L . --no-auto-compile -e '(configure)' !# ;;; GNU Mes --- Maxwell Equations of Software -;;; Copyright © 2016,2017,2018,2019,2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2016,2017,2018,2019,2020,2021 Jan (janneke) Nieuwenhuizen ;;; ;;; configure: This file is part of GNU Mes. ;;; @@ -479,7 +479,7 @@ Some influential environment variables: (guile (file-name "guile" deps)) ;; See https://bugs.gnu.org/43831; use -O1 with Guile-3 (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) deps))