builder, checker: simplify, utilize pref.vroot (#21096)

vlang · Mar 25, 2024 · 842efdf · 842efdf
1 parent f77bb32
commit 842efdf
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/vlib/v/builder/cc.v b/vlib/v/builder/cc.v
@@ -944,7 +944,7 @@ fn (mut v Builder) build_thirdparty_obj_file(mod string, path string, moduleflag
 	}
 	// prepare for tcc, it needs relative paths to thirdparty/tcc to work:
 	current_folder := os.getwd()
-	os.chdir(os.dir(pref.vexe_path())) or {}
+	os.chdir(v.pref.vroot) or {}
 	//
 	mut all_options := []string{}
 	all_options << v.pref.third_party_option

diff --git a/vlib/v/builder/cc_windows.v b/vlib/v/builder/cc_windows.v
@@ -21,8 +21,7 @@ pub fn (mut v Builder) find_win_cc() ! {
 			if v.pref.is_verbose {
 				println('msvc not found, looking for thirdparty/tcc...')
 			}
-			vpath := os.dir(pref.vexe_path())
-			thirdparty_tcc := os.join_path(vpath, 'thirdparty', 'tcc', 'tcc.exe')
+			thirdparty_tcc := os.join_path(v.pref.vroot, 'thirdparty', 'tcc', 'tcc.exe')
 			tcc_version_res := os.execute('${os.quoted_path(thirdparty_tcc)} -v')
 			if tcc_version_res.exit_code != 0 {
 				if v.pref.is_verbose {

diff --git a/vlib/v/builder/compile.v b/vlib/v/builder/compile.v
@@ -290,10 +290,9 @@ pub fn (v &Builder) get_user_files() []string {
 	// libs, but we dont know	which libs need to be added yet
 	mut user_files := []string{}
 	// See cmd/tools/preludes/README.md for more info about what preludes are
-	vroot := os.dir(pref.vexe_path())
-	mut preludes_path := os.join_path(vroot, 'vlib', 'v', 'preludes')
+	mut preludes_path := os.join_path(v.pref.vroot, 'vlib', 'v', 'preludes')
 	if v.pref.backend == .js_node {
-		preludes_path = os.join_path(vroot, 'vlib', 'v', 'preludes_js')
+		preludes_path = os.join_path(v.pref.vroot, 'vlib', 'v', 'preludes_js')
 	}
 	if v.pref.trace_calls {
 		user_files << os.join_path(preludes_path, 'trace_calls.v')

diff --git a/vlib/v/checker/checker.v b/vlib/v/checker/checker.v
@@ -2374,7 +2374,7 @@ fn (mut c Checker) hash_stmt(mut node ast.HashStmt) {
 				flag = vroot
 			}
 			if flag.contains('@VEXEROOT') {
-				vroot := flag.replace('@VEXEROOT', os.dir(pref.vexe_path()))
+				vroot := flag.replace('@VEXEROOT', c.pref.vroot)
 				node.val = '${node.kind} ${vroot}'
 				node.main = vroot
 				flag = vroot
@@ -2459,7 +2459,7 @@ fn (mut c Checker) hash_stmt(mut node ast.HashStmt) {
 			}
 			if flag.contains('@VEXEROOT') {
 				// expand `@VEXEROOT` to its absolute path
-				flag = flag.replace('@VEXEROOT', os.dir(pref.vexe_path()))
+				flag = flag.replace('@VEXEROOT', c.pref.vroot)
 			}
 			if flag.contains('@VMODROOT') {
 				flag = util.resolve_vmodroot(flag, c.file.path) or {
@@ -3486,10 +3486,10 @@ fn (mut c Checker) at_expr(mut node ast.AtExpr) ast.Type {
 			node.val = c.vmod_file_content
 		}
 		.vroot_path {
-			node.val = os.dir(pref.vexe_path())
+			node.val = c.pref.vroot
 		}
 		.vexeroot_path {
-			node.val = os.dir(pref.vexe_path())
+			node.val = c.pref.vroot
 		}
 		.vmodroot_path {
 			mut mcache := vmod.get_cache()