From ad1158854056fe20a90cb699c36060d7a28ea1b0 Mon Sep 17 00:00:00 2001
From: Roman Venediktov <e2e4b6b7@gmail.com>
Date: Tue, 2 Jul 2024 17:07:50 +0200
Subject: [PATCH] Fix runtime build flags

---
 regression/Makefile        |  2 +-
 runtime/Makefile           | 11 +++++++++--
 stdlib/regression/Makefile |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/regression/Makefile b/regression/Makefile
index 8a4da83f2..7226f0c16 100644
--- a/regression/Makefile
+++ b/regression/Makefile
@@ -7,7 +7,7 @@ UNAME_S := $(shell uname -s)
 
 ifeq ($(UNAME_S),Linux)
 else ifeq ($(UNAME_S),Darwin)
-    ARCH = arch -x86_64
+    ARCH = -arch x86_64
 endif
 
 .PHONY: check $(TESTS)
diff --git a/runtime/Makefile b/runtime/Makefile
index b15fbce12..4a947e263 100644
--- a/runtime/Makefile
+++ b/runtime/Makefile
@@ -1,6 +1,13 @@
+UNAME_S := $(shell uname -s)
+
+ifeq ($(UNAME_S),Linux)
+else ifeq ($(UNAME_S),Darwin)
+    ARCH = -arch x86_64
+endif
+
 CC=clang
-DISABLE_ERRORS=-Wno-error=implicit-function-declaration -Wno-shift-negative-value
-COMMON_FLAGS=$(DISABLE_ERRORS) -g2 -fstack-protector-all -arch x86_64 --std=c11
+DISABLE_WARNINGS=-Wno-shift-negative-value
+COMMON_FLAGS=$(DISABLE_WARNINGS) -g -fstack-protector-all $(ARCH) --std=c11
 PROD_FLAGS=$(COMMON_FLAGS) -DLAMA_ENV
 TEST_FLAGS=$(COMMON_FLAGS) -DDEBUG_VERSION
 UNIT_TESTS_FLAGS=$(TEST_FLAGS)
diff --git a/stdlib/regression/Makefile b/stdlib/regression/Makefile
index f8f4e24ab..3368d4b64 100644
--- a/stdlib/regression/Makefile
+++ b/stdlib/regression/Makefile
@@ -6,7 +6,7 @@ UNAME_S := $(shell uname -s)
 
 ifeq ($(UNAME_S),Linux)
 else ifeq ($(UNAME_S),Darwin)
-    ARCH = arch -x86_64
+    ARCH = -arch x86_64
 endif
 
 .PHONY: check $(TESTS)