aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorgingerBill <bill@gingerbill.org>2020-06-29 17:35:33 +0100
committergingerBill <bill@gingerbill.org>2020-06-29 17:35:33 +0100
commit0ea64182f1a05803a64f5495a9edb740c6d2488e (patch)
tree92ae802dc87693d602090ca7b0482de7eb67b3cd /src/main.cpp
parent8478b887a594ebbad9789888db006eb149d3b0c3 (diff)
Begin work on windows 386
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 4cfcdf7c9..450dcdf48 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -162,7 +162,7 @@ i32 linker_stage(lbGenerator *gen) {
LIT(target_arch_names[build_context.metrics.arch])
);
#endif
- } else if (build_context.cross_compiling) {
+ } else if (build_context.cross_compiling && build_context.different_os) {
gb_printf_err("Linking for cross compilation for this platform is not yet supported (%.*s %.*s)\n",
LIT(target_os_names[build_context.metrics.os]),
LIT(target_arch_names[build_context.metrics.arch])
@@ -1689,10 +1689,10 @@ int main(int arg_count, char const **arg_ptr) {
init_build_context(selected_target_metrics ? selected_target_metrics->metrics : nullptr);
- if (build_context.word_size == 4 && build_context.metrics.os != TargetOs_js) {
- print_usage_line(0, "%.*s 32-bit is not yet supported for this platform", LIT(args[0]));
- return 1;
- }
+ // if (build_context.word_size == 4 && build_context.metrics.os != TargetOs_js) {
+ // print_usage_line(0, "%.*s 32-bit is not yet supported for this platform", LIT(args[0]));
+ // return 1;
+ // }
if (build_context.metrics.os == TargetOs_js) {
if (!build_context.use_llvm_api) {
print_usage_line(0, "%.*s - js platform only supported with the -llvm-api backend", LIT(args[0]));
@@ -1880,7 +1880,7 @@ int main(int arg_count, char const **arg_ptr) {
LIT(target_arch_names[build_context.metrics.arch])
);
#endif
- } else if (build_context.cross_compiling) {
+ } else if (build_context.cross_compiling && build_context.different_os) {
gb_printf_err("Linking for cross compilation for this platform is not yet supported (%.*s %.*s)\n",
LIT(target_os_names[build_context.metrics.os]),
LIT(target_arch_names[build_context.metrics.arch])