compiler: fix cross-transpilation is not imitates target architecture…

… for architecture-dependent types
julelang · Mar 7, 2024 · 307cf74 · 307cf74
1 parent a347f36
commit 307cf74
Show file tree

Hide file tree

Showing 10 changed files with 232 additions and 193 deletions.
diff --git a/src/julec/compile.jule b/src/julec/compile.jule
@@ -21,7 +21,7 @@ use std::jule::sema::{
     SemaFlag,
     analyze_package,
 }
-use std::jule::build::{
+use build for std::jule::build::{
     self,
     LogMsg,
     Log,
@@ -34,6 +34,7 @@ use std::jule::build::{
     logf,
     is_valid_cpp_ext,
 }
+use types for std::jule::types
 use std::process::{ProcessError, Cmd}
 use strings for std::strings
 
@@ -271,13 +272,13 @@ fn check_target_flag(&target: str) {
 
     if os != "native" {
         check_target_os(os)
-        env::OS = os
+        build::OS = os
     }
-
     if arch != "native" {
         check_target_arch(arch)
-        env::ARCH = arch
+        build::ARCH = arch
     }
+    types::update_target()
 }
 
 fn check_opt_flag(&opt: str) {

diff --git a/src/julec/env/platform.jule b/src/julec/env/platform.jule
diff --git a/src/julec/importer/annotation.jule b/src/julec/importer/annotation.jule
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD 3-Clause
 // license that can be found in the LICENSE file.
 
-use env
-
 use path for std::fs::path
 use build for std::jule::build
 use strings for std::strings
@@ -13,10 +11,14 @@ fn check_os(arg: str): (ok: bool, exist: bool) {
     exist = true
 
     match arg {
-    | build::Os.Windows: ok = build::is_windows(env::OS)
-    | build::Os.Darwin:  ok = build::is_darwin(env::OS)
-    | build::Os.Linux:   ok = build::is_linux(env::OS)
-    | build::Os.Unix:    ok = build::is_unix(env::OS)
+    | build::Os.Windows:
+        ok = build::is_windows(build::OS)
+    | build::Os.Darwin:
+        ok = build::is_darwin(build::OS)
+    | build::Os.Linux:
+        ok = build::is_linux(build::OS)
+    | build::Os.Unix:
+        ok = build::is_unix(build::OS)
     |:
         ok = true
         exist = false
@@ -30,11 +32,16 @@ fn check_arch(arg: str): (ok: bool, exist: bool) {
     exist = true
 
     match arg {
-    | build::Arch.I386:  ok = build::is_i386(env::ARCH)
-    | build::Arch.Amd64: ok = build::is_amd64(env::ARCH)
-    | build::Arch.Arm64: ok = build::is_arm64(env::ARCH)
-    | build::Arch.X64: ok = build::is_64bit(env::ARCH)
-    | build::Arch.X32: ok = build::is_32bit(env::ARCH)
+    | build::Arch.I386:
+        ok = build::is_i386(build::ARCH)
+    | build::Arch.Amd64:
+        ok = build::is_amd64(build::ARCH)
+    | build::Arch.Arm64:
+        ok = build::is_arm64(build::ARCH)
+    | build::Arch.X64:
+        ok = build::is_64bit(build::ARCH)
+    | build::Arch.X32:
+        ok = build::is_32bit(build::ARCH)
     |:
         ok = true
         exist = false

diff --git a/src/julec/importer/var.jule b/src/julec/importer/var.jule
@@ -4,35 +4,25 @@
 
 use env
 
-use std::jule::build::{Os, Arch, is_unix, is_32bit, is_64bit}
+use build for std::jule::build
 
 pub static mut VARS: []str = nil
 
 // Set operating system variables by native operating system.
 fn set_os_vars() {
-    match env::OS {
-    | Os.Windows: VARS = append(VARS, "windows")
-    | Os.Linux:   VARS = append(VARS, "linux")
-    | Os.Darwin:  VARS = append(VARS, "darwin")
-    }
-
-    if is_unix(env::OS) {
+    VARS = append(VARS, build::OS)
+    if build::is_unix(build::OS) {
         VARS = append(VARS, "unix")
     }
 }
 
 // Set architecture variables by native architecture.
 fn set_arch_vars() {
-    match env::ARCH {
-    | Arch.I386:  VARS = append(VARS, "i386")
-    | Arch.Amd64: VARS = append(VARS, "amd64")
-    | Arch.Arm64: VARS = append(VARS, "arm64")
-    }
-
-    if is_64bit(env::ARCH) {
+    VARS = append(VARS, build::ARCH)
+    if build::is_64bit(build::ARCH) {
         VARS = append(VARS, "x64")
     }
-    if is_32bit(env::ARCH) {
+    if build::is_32bit(build::ARCH) {
         VARS = append(VARS, "x32")
     }
 }
@@ -51,13 +41,18 @@ pub fn init_vars() {
     }
 
     match env::COMPILER {
-    | "clang": VARS = append(VARS, "clang")
-    | "gcc":   VARS = append(VARS, "gcc")
+    | "clang":
+        VARS = append(VARS, "clang")
+    | "gcc":
+        VARS = append(VARS, "gcc")
     }
 
     match env::CPP_STD {
-    | "cpp14": VARS = append(VARS, "cpp14")
-    | "cpp17": VARS = append(VARS, "cpp17")
-    | "cpp20": VARS = append(VARS, "cpp20")
+    | "cpp14":
+        VARS = append(VARS, "cpp14")
+    | "cpp17":
+        VARS = append(VARS, "cpp17")
+    | "cpp20":
+        VARS = append(VARS, "cpp20")
     }
 }
diff --git a/std/jule/build/env.jule b/std/jule/build/env.jule
@@ -13,6 +13,14 @@ pub static PATH_EXEC = ""   // Path of executable file's directory.
 pub static PATH_WD = ""     // Path of working directory.
 pub static PATH_API = ""    // Path of main API header file.
 
+// Target operating system.
+// Setted to runtime operating system by default.
+pub static mut OS = env::OS
+
+// Target architecture.
+// Setted to runtime architecture by default.
+pub static mut ARCH = env::ARCH
+
 fn init() {
     let mut path = process::executable()
     if path == "" {