Remove asm auto-detection due to cross-compilation issues.

diff --git a/src/Makefile b/src/Makefile
index c0deb774b809e4215167603582906ca7792c6190..a4a8152bea68dc94f552fc9046aca686d5bae32f 100644 (file)
--- 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= @:

diff --git a/src/buildvm.c b/src/buildvm.c
index 4aba39d42dacfb341751aab4f195682374a73c1d..94e2d9a242827e5e8899d6fe644b6632e9a43034 100644 (file)
--- a/src/buildvm.c
+++ b/src/buildvm.c
@@ -398,16 +398,6 @@ int main(int argc, char **argv)
   }
 
   switch (ctx->mode) {
-  case BUILD_asm:
-#if defined(__ELF__)
-    ctx->mode = BUILD_elfasm;
-#elif defined(__MACH__)
-    ctx->mode = BUILD_machasm;
-#else
-    fprintf(stderr,"Error: auto-guessing the system assembler failed\n");
-    return 1;
-#endif
-    /* fallthrough */
   case BUILD_elfasm:
   case BUILD_coffasm:
   case BUILD_machasm:

diff --git a/src/buildvm.h b/src/buildvm.h
index 53c820adb9e957e1ac9045487a331413c86a6b8d..4bf4e56d22f391494c9fd8010196f81788c3d7c5 100644 (file)
--- a/src/buildvm.h
+++ b/src/buildvm.h
@@ -49,7 +49,7 @@ struct dasm_State;
 #endif
 
 #define BUILDDEF(_) \
-  _(asm) _(elfasm) _(coffasm) _(machasm) BUILDDEFX(_) _(raw) \
+  _(elfasm) _(coffasm) _(machasm) BUILDDEFX(_) _(raw) \
   _(ffdef) _(libdef) _(recdef) _(vmdef) \
   _(folddef)