andrius
/
mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

* configure (main): Set guild_optimize to "-O1" for Guile-3.
* build-aux/config.make.in (GUILD_OPTIMIZE): New variable.
* build-aux/export.make (GUILD_OPTIMIZE): Export if set.
* build-aux/config.sh.in (GUILD_OPTIMIZE): New variable.
* build-aux/build-guile.sh: Use it.
This commit is contained in:
Jan (janneke) Nieuwenhuizen 2020-10-07 13:55:06 +02:00
parent caddb895a9
commit 30f49c25d4
No known key found for this signature in database
GPG Key ID: F3C1A0D9C1D65273
5 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-aux/build-guile.sh
View File

@ -60,6 +60,6 @@ for i in $SCM_FILES $SCRIPTS; do
go=${i%%.scm}.go
f=${srcdest}$i
if test $f -nt $go; then
trace "GUILEC $f" $GUILD compile -L ${srcdest}module -L ${srcdest}build-aux -L ${srcdest}scripts -o $go $f
trace "GUILEC $f" $GUILD compile $GUILD_OPTIMIZE -L ${srcdest}module -L ${srcdest}build-aux -L ${srcdest}scripts -o $go $f
fi
done

1
build-aux/config.make.in
View File

@ -24,6 +24,7 @@ DIFF:=@DIFF@
DOT:=@DOT@
GIT:=@GIT@
GUILD:=@GUILD@
GUILD_OPTIMIZE:=@GUILD_OPTIMIZE@
GUILE:=@GUILE@
GUILE_EFFECTIVE_VERSION:=@GUILE_EFFECTIVE_VERSION@
GUIX:=@GUIX@

1
build-aux/config.sh.in
View File

@ -25,6 +25,7 @@ DIFF=${DIFF-@DIFF@}
DOT="@DOT@"
GIT="@GIT@"
GUILD="@GUILD@"
GUILD_OPTIMIZE="${GUILD_OPTIMIZE-@GUILD_OPTIMIZE@}"
GUILE="@GUILE@"
GUILE_EFFECTIVE_VERSION="@GUILE_EFFECTIVE_VERSION@"
GUIX="@GUIX@"

4
build-aux/export.make
View File

@ -123,6 +123,10 @@ ifdef SHELL
export SHELL
endif
ifdef GUILD_OPTIMIZE
export GUILD_OPTIMIZE
endif
ifdef GUILE_LOAD_PATH
export GUILE_LOAD_PATH
endif

8
configure vendored
View File

@ -363,6 +363,8 @@ Some influential environment variables:
CFLAGS C compiler flags
GUILE guile command
GUILD guild command
GUILD_OPTIMIZE guild compile optimization
GUILE_LOAD_PATH guile load path; where to find Nyacc
MES_FOR_BUILD build system MES [can be mes or guile]
" PACKAGE VERSION (getenv "prefix")))
@ -445,7 +447,10 @@ Some influential environment variables:
(make-dep "perl" #:version '(5) #:optional? #t)
(make-dep "git" #:version '(2) #:optional? #t))))
(guile (file-name "guile" deps))
(deps (if guile (cons (check-program-version (make-dep "nyacc" #:version '(0 86 0) #:commands (list (string-append guile " -c '(use-modules (nyacc lalr)) (display *nyacc-version*)'")) #:file-name #t))
;; 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")))
(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))
(guile (or guile "guile"))
@ -591,6 +596,7 @@ See \"Porting GNU Mes\" in the manual, or try --with-courage\n" mes-system)
("@DIFF@" . ,(or (file-name "diff" deps) (string-append abs-top-builddir "/pre-inst-env diff.scm")))
("@DOT@" . ,(or (file-name "dot" deps) ""))
("@GIT@" . ,(or (file-name "git" deps) ""))
("@GUILD_OPTIMIZE@" . ,(or (getenv "GUILD_OPTIMIZE") guild-optimize ""))
("@GUILE@" . ,guile)
("@GUIX@" . ,(or (file-name "guix" deps) ""))
("@HELP2MAN@" . ,(or (file-name "help2man" deps) ""))