From 6163a90d6d09e53e8a22079e95af5ecc8b97e9cc Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Tue, 8 Dec 2009 21:28:49 +0100
Subject: Remove asm auto-detection due to cross-compilation issues.

---
 src/Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index c0deb774..a4a8152b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -231,7 +231,7 @@ HOST_T= $(BUILDVM_T)
 LJVM_S= lj_vm.s
 LJVM_O= lj_vm.o
 LJVM_BOUT= $(LJVM_S)
-LJVM_MODE= asm
+LJVM_MODE= elfasm
 
 LJLIB_O= lib_base.o lib_math.o lib_bit.o lib_string.o lib_table.o \
 	 lib_io.o lib_os.o lib_package.o lib_debug.o lib_jit.o
@@ -293,6 +293,9 @@ ifeq (Windows,$(TARGET_SYS))
     TARGET_XCFLAGS+= -DLUA_BUILD_AS_DLL
   endif
 endif
+ifeq (Darwin,$(TARGET_SYS))
+  LJVM_MODE= machasm
+endif
 
 ifeq (static,$(BUILDMODE))
   TARGET_DYNCC= @:
-- 
cgit v1.2.3-55-g6feb