diff options
| author | LeRoyce Pearson <leroycepearson@geemili.xyz> | 2020-03-27 11:32:33 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-27 11:32:33 -0600 |
| commit | c7f4e68464e0ebd6e6d0f3230114d189e25e3dc9 (patch) | |
| tree | 1039973f89854e5256d86ecfecc87b2b61be46cd /src/stage2.cpp | |
| parent | 1a6c3aeec9226eba02655c77872bd01eaa9be711 (diff) | |
| parent | aec4967f36d16cfee43529bd341300f5f77af34a (diff) | |
| download | zig-c7f4e68464e0ebd6e6d0f3230114d189e25e3dc9.tar.gz zig-c7f4e68464e0ebd6e6d0f3230114d189e25e3dc9.zip | |
Merge branch 'master' into feature-file-locks
Diffstat (limited to 'src/stage2.cpp')
| -rw-r--r-- | src/stage2.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/stage2.cpp b/src/stage2.cpp index c83b1aa77c..f8a485f93b 100644 --- a/src/stage2.cpp +++ b/src/stage2.cpp @@ -181,7 +181,8 @@ static void get_native_target(ZigTarget *target) { &target->abi, &oformat); target->os = get_zig_os_type(os_type); - target->is_native = true; + target->is_native_os = true; + target->is_native_cpu = true; if (target->abi == ZigLLVM_UnknownEnvironment) { target->abi = target_default_abi(target->arch, target->os); } @@ -204,7 +205,8 @@ Error stage2_target_parse(struct ZigTarget *target, const char *zig_triple, cons target->llvm_cpu_features = ZigLLVMGetNativeFeatures(); target->cache_hash = "native\n\n"; } else if (strcmp(mcpu, "baseline") == 0) { - target->is_native = false; + target->is_native_os = false; + target->is_native_cpu = false; target->llvm_cpu_name = ""; target->llvm_cpu_features = ""; target->cache_hash = "baseline\n\n"; |