nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build: Use '-Wshadowed-toplevel' only when supported. 

* guix/build/compile.scm (supported-warning-type?): New procedure.
(%warnings): Remove 'unsupported-warning', though removing it doesn't
make any difference.  Define 'optional', and use it to determine whether
to include 'shadowed-toplevel'.
This commit is contained in:
Ludovic Courtès 2019-07-12 22:38:03 +02:00
parent 6cf63fe887
commit e429566fbb
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
guix/build/compile.scm
View File

@ -18,6 +18,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (guix build compile) (define-module (guix build compile)
#:use-module (srfi srfi-1)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (ice-9 format) #:use-module (ice-9 format)
#:use-module (ice-9 threads) #:use-module (ice-9 threads)
@ -58,13 +59,23 @@
((kw _ rest ...) ((kw _ rest ...)
(loop rest `(#f ,kw ,@result)))))) (loop rest `(#f ,kw ,@result))))))
(define (supported-warning-type? type)
"Return true if TYPE, a symbol, denotes a supported warning type."
(find (lambda (warning-type)
(eq? type (warning-type-name warning-type)))
%warning-types))
(define %warnings (define %warnings
;; FIXME: 'format' is missing because it reports "non-literal format ;; FIXME: 'format' is missing because it reports "non-literal format
;; strings" due to the fact that we use 'G_' instead of '_'. We'll need ;; strings" due to the fact that we use 'G_' instead of '_'. We'll need
;; help from Guile to solve this. ;; help from Guile to solve this.
'(unsupported-warning unbound-variable arity-mismatch (let ((optional (lambda (type)
macro-use-before-definition ;new in 2.2 (if (supported-warning-type? type)
shadowed-toplevel)) ;new in 2.2.5 (list type)
'()))))
`(unbound-variable arity-mismatch
macro-use-before-definition ;new in 2.2
,@(optional 'shadowed-toplevel)))) ;new in 2.2.5
(define (optimization-options file) (define (optimization-options file)
"Return the default set of optimizations options for FILE." "Return the default set of optimizations options for FILE."