From 612fe84e510f105a89a0b3cfcc69a2c274e3d743 Mon Sep 17 00:00:00 2001 From: Egor Sheremetov Date: Tue, 28 May 2024 16:22:54 +0200 Subject: [PATCH] Added explicit translation for macos using Rosetta (hopefully) --- regression/Makefile | 4 ++-- runtime/Makefile | 2 +- stdlib/regression/Makefile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/regression/Makefile b/regression/Makefile index 51522a852..f74f736bd 100644 --- a/regression/Makefile +++ b/regression/Makefile @@ -12,11 +12,11 @@ $(TESTS): %: %.lama @echo "regression/$@" # @cat $@.input | LAMA=../runtime $(LAMAC) -i $< > $@.log && diff $@.log orig/$@.log # @cat $@.input | LAMA=../runtime $(LAMAC) -ds -s $< > $@.log && diff $@.log orig/$@.log - @LAMA=../runtime $(LAMAC) $< && cat $@.input | ./$@ > $@.log && diff $@.log orig/$@.log + @LAMA=../runtime $(LAMAC) $< && cat $@.input | arch -x86_64 ./$@ > $@.log && diff $@.log orig/$@.log ctest111: @echo "regression/test111" - @LAMA=../runtime $(LAMAC) test111.lama && cat test111.input | ./test111 > test111.log && diff test111.log orig/test111.log + @LAMA=../runtime $(LAMAC) test111.lama && cat test111.input | arch -x86_64 ./test111 > test111.log && diff test111.log orig/test111.log clean: $(RM) test*.log *.s *.sm *~ $(TESTS) *.i $(DEBUG_FILES) test111 diff --git a/runtime/Makefile b/runtime/Makefile index 210a1ee0e..80d98abba 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -1,5 +1,5 @@ CC=clang -COMMON_FLAGS=-g2 -std=gnu99 -fstack-protector-all -Wno-error=implicit-function-declaration -arch x86_64 +COMMON_FLAGS=-g2 -fstack-protector-all -Wno-error=implicit-function-declaration -arch x86_64 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 6d2eb8134..783a85261 100644 --- a/stdlib/regression/Makefile +++ b/stdlib/regression/Makefile @@ -8,7 +8,7 @@ check: $(TESTS) $(TESTS): %: %.lama @echo "stdlib/regression/$@" - @LAMA=../../runtime $(LAMAC) -I .. -ds -dp $< && ./$@ > $@.log && diff $@.log orig/$@.log + @LAMA=../../runtime $(LAMAC) -I .. -ds -dp $< && arch -X86_64 ./$@ > $@.log && diff $@.log orig/$@.log clean: $(RM) test*.log *.s *~ $(TESTS) *.i