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

builder: fix an error on windows

pull/4282/head
yuyi 2020-04-07 18:32:49 +08:00 committed by GitHub
parent 426eb46166
commit 08d90afb8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vlib/v/builder/builder.v
View File

@ -19,7 +19,6 @@ pub:
pref &pref.Preferences pref &pref.Preferences
table &table.Table table &table.Table
checker checker.Checker checker checker.Checker
os pref.OS // the OS to build for
compiled_dir string // contains os.real_path() of the dir of the final file beeing compiled, or the dir itself when doing `v .` compiled_dir string // contains os.real_path() of the dir of the final file beeing compiled, or the dir itself when doing `v .`
module_path string module_path string
mut: mut:
@ -163,17 +162,16 @@ pub fn (b Builder) v_files_from_dir(dir string) []string {
if file.ends_with('_test.v') { if file.ends_with('_test.v') {
continue continue
} }
if (file.ends_with('_win.v') || file.ends_with('_windows.v')) && b.os != if (file.ends_with('_win.v') || file.ends_with('_windows.v')) && b.pref.os != .windows {
.windows {
continue continue
} }
if (file.ends_with('_lin.v') || file.ends_with('_linux.v')) && b.os != .linux { if (file.ends_with('_lin.v') || file.ends_with('_linux.v')) && b.pref.os != .linux {
continue continue
} }
if (file.ends_with('_mac.v') || file.ends_with('_darwin.v')) && b.os != .mac { if (file.ends_with('_mac.v') || file.ends_with('_darwin.v')) && b.pref.os != .mac {
continue continue
} }
if file.ends_with('_nix.v') && b.os == .windows { if file.ends_with('_nix.v') && b.pref.os == .windows {
continue continue
} }
if file.ends_with('_android.v') && b.pref.os != .android { if file.ends_with('_android.v') && b.pref.os != .android {
@ -185,10 +183,10 @@ pub fn (b Builder) v_files_from_dir(dir string) []string {
if file.ends_with('_solaris.v') && b.pref.os != .solaris { if file.ends_with('_solaris.v') && b.pref.os != .solaris {
continue continue
} }
if file.ends_with('_js.v') && b.os != .js { if file.ends_with('_js.v') && b.pref.os != .js {
continue continue
} }
if file.ends_with('_c.v') && b.os == .js { if file.ends_with('_c.v') && b.pref.os == .js {
continue continue
} }
if b.pref.compile_defines_all.len > 0 && file.contains('_d_') { if b.pref.compile_defines_all.len > 0 && file.contains('_d_') {