vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

compiler: update & enable cflag error (#2420) 

* merge master
* update & enable cflag error
pull/2421/head
joe-conigliaro 2019-10-19 11:38:02 +11:00 committed by GitHub
parent 22c7438795
commit b51b8858d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vlib/compiler/cflags.v
View File

@ -126,12 +126,9 @@ fn (table mut Table) parse_cflag(cflag string, mod string) ?bool {
index = -1 index = -1
} }
if (name in ['-I', '-l', '-L']) && value == '' { if (name in ['-I', '-l', '-L']) && value == '' {
if name == '-I' || name == '-L' { hint := if name == '-l' { 'library name' } else { 'path' }
return error('bad #flag `$flag_orig`: missing path after `-I`') return error('bad #flag `$flag_orig`: missing $hint after `$name`')
} else if name == '-l' { }
return error('bad #flag `$flag_orig`: missing library name after `-l`')
}
}
cf := CFlag{ cf := CFlag{
mod: mod, mod: mod,
os: fos, os: fos,

4
vlib/compiler/comptime.v
View File

@ -185,7 +185,9 @@ fn (p mut Parser) chash() {
flag = flag.replace('@VROOT', p.vroot) flag = flag.replace('@VROOT', p.vroot)
flag = flag.replace('@VMOD', v_modules_path) flag = flag.replace('@VMOD', v_modules_path)
//p.log('adding flag "$flag"') //p.log('adding flag "$flag"')
p.table.parse_cflag(flag, p.mod) _ = p.table.parse_cflag(flag, p.mod) or {
p.error_with_token_index(err, p.cur_tok_index()-1)
}
} }
return return
} }