fix(carpntr,hammer): on apple silicon force target to be aarch64-macos-gnu instead of native

Author: JaDogg

compiler/carpntr/build/program_code.c

@@ -105,6 +105,7 @@ void yy__building_build_objects_sequential(struct yy__building_BObject**);
 void yy__building_build_objects(struct yy__building_BObject**);
 void yy__building_cleanup_buildables(struct yy__building_BObject**);
 bool yy__building_keep_ray_objects(yk__sds, bool);
+bool yy__building_is_arm64_cpu();
 yk__sds* yy__building_create_args(struct yy__configuration_Config*, yk__sds, yk__sds, yk__sds, yk__sds*);
 void yy__building_print_target_eq(yk__sds, bool);
 int32_t yy__building_build_target(struct yy__configuration_Config*, yk__sds, yk__sds, yk__sds, yk__sds*, bool);
@@ -1245,6 +1246,16 @@ bool yy__building_keep_ray_objects(yk__sds yy__building_element, bool yy__buildi
     yk__sdsfree(yy__building_element);
     return t__25;
 }
+bool yy__building_is_arm64_cpu() 
+{
+    
+    #if defined(__arm64__) || defined(__aarch64__) || defined(__arm64)
+        return true;
+    #else
+        return false;
+    #endif
+    ;
+}
 yk__sds* yy__building_create_args(struct yy__configuration_Config* yy__building_c, yk__sds yy__building_code_path, yk__sds yy__building_build_path, yk__sds yy__building_target, yk__sds* yy__building_raylib_args) 
 {
     bool yy__building_native = (yk__sdslen(yy__building_target) == INT32_C(0));
@@ -1412,6 +1423,11 @@ yk__sds* yy__building_create_args(struct yy__configuration_Config* yy__building_
         yk__arrput(yy__building_args, yk__sdsnewlen("-target", 7));
         yk__arrput(yy__building_args, yk__sdsnewlen("wasm32-wasi-musl", 16));
     }
+    if ((yy__building_native && yy__building_is_arm64_cpu()) && yy__building_is_target_macos(yk__sdsdup(yy__building_target)))
+    {
+        yk__arrput(yy__building_args, yk__sdsnewlen("-target", 7));
+        yk__arrput(yy__building_args, yk__sdsnewlen("aarch64-macos-gnu", 17));
+    }
     yy__building_length = yk__arrlen(yy__building_c->yy__configuration_c_code->yy__configuration_runtime_feature_c_code);
     yy__building_x = INT32_C(0);
     while (true)

compiler/carpntr/building.yaka

@@ -231,6 +231,17 @@ def keep_ray_objects(element: str, negate: bool) -> bool:
         return not obj
     return obj
 
+@native
+def is_arm64_cpu() -> bool:
+    # way to detect if we are running m1/m2/etc macos
+    ccode """
+    #if defined(__arm64__) || defined(__aarch64__) || defined(__arm64)
+        return true;
+    #else
+        return false;
+    #endif
+    """
+
 def create_args(c: carp.Config, code_path: str, build_path: str, target: str, raylib_args: Array[str]) -> Array[str]:
     # Create arguments for compilation on to a string array
     # This string array need to be deleted
@@ -291,6 +302,10 @@ def create_args(c: carp.Config, code_path: str, build_path: str, target: str, ra
     if target == "wasm4":
         arrput(args, "-target")
         arrput(args, "wasm32-wasi-musl")
+    # m1/m2/etc must not build for native, instead build for "aarch64-macos-gnu"
+    if native and is_arm64_cpu() and is_target_macos(target):
+        arrput(args, "-target")
+        arrput(args, "aarch64-macos-gnu")
     # runtime c codes
     length = len(c.c_code.runtime_feature_c_code)
     x = 0

compiler/hammer/main.yaka

@@ -95,6 +95,17 @@ def is_target_macos(target_to_check: str) -> bool:
         return os.is_macos()
     return strings.contains(target_to_check, "macos")
 
+@native
+def is_arm64_cpu() -> bool:
+    # way to detect if we are running m1/m2/etc macos
+    ccode """
+    #if defined(__arm64__) || defined(__aarch64__) || defined(__arm64)
+        return true;
+    #else
+        return false;
+    #endif
+    """
+
 def is_target_windows(target_to_check: str) -> bool:
     # Check if given target is windows, if target == native, check if we are running windows
     native: bool = target_to_check == "native"
@@ -120,6 +131,10 @@ def get_base_args(c: conf.HammerConfig, target: str, cpp: bool) -> Array[str]:
     if not (target == "native"):
         arrput(args, "-target")
         arrput(args, target)
+    # m1/m2/etc must not build for native, instead build for "aarch64-macos-gnu"
+    if target == "native" and is_arm64_cpu() and is_target_macos(target):
+        arrput(args, "-target")
+        arrput(args, "aarch64-macos-gnu")
     args = sarr.extend(args, c.args_c_or_cpp)
     if cpp:
         args = sarr.extend(args, c.args_cpp)