github-repos/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2025-01-15 06:40:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Map Guile variable objects to the empty string.

Browse Source 
In Guile 2.0, (define ...) results in a variable object.  Ensure make
converts that to an empty string to avoid spurious errors.
This commit is contained in:
Paul Smith 2012-01-30 01:40:56 +00:00
parent ef6461611b
commit e3b394f3f0
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2012-01-29 Paul Smith <psmith@gnu.org> 2012-01-29 Paul Smith <psmith@gnu.org>
* gmk-default.scm (to-string-maybe): Variables map to empty strings.
In Guile 2.0, (define ...) results in a variable object so make
sure that maps to an empty string in make.
* variable.c (parse_variable_definition): New POSIX assignment ::= * variable.c (parse_variable_definition): New POSIX assignment ::=
Take a struct variable to return more information after parsing. Take a struct variable to return more information after parsing.
(assign_variable_definition): New parse_variable_definition() call. (assign_variable_definition): New parse_variable_definition() call.

1
gmk-default.scm
View File

@ -20,6 +20,7 @@
;; In GNU make, "false" is the empty string ;; In GNU make, "false" is the empty string
((or (not x) ((or (not x)
(unspecified? x) (unspecified? x)
(variable? x)
(null? x) (null? x)
(and (string? x) (string-null? x))) (and (string? x) (string-null? x)))
#f) #f)