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

This commit is contained in:
Mike Pall 2009-12-08 21:28:49 +01:00
parent 699232f667
commit 6163a90d6d
3 changed files with 5 additions and 12 deletions

View File

@ -231,7 +231,7 @@ HOST_T= $(BUILDVM_T)
LJVM_S= lj_vm.s LJVM_S= lj_vm.s
LJVM_O= lj_vm.o LJVM_O= lj_vm.o
LJVM_BOUT= $(LJVM_S) 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 \ 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 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 TARGET_XCFLAGS+= -DLUA_BUILD_AS_DLL
endif endif
endif endif
ifeq (Darwin,$(TARGET_SYS))
LJVM_MODE= machasm
endif
ifeq (static,$(BUILDMODE)) ifeq (static,$(BUILDMODE))
TARGET_DYNCC= @: TARGET_DYNCC= @:

View File

@ -398,16 +398,6 @@ int main(int argc, char **argv)
} }
switch (ctx->mode) { 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_elfasm:
case BUILD_coffasm: case BUILD_coffasm:
case BUILD_machasm: case BUILD_machasm:

View File

@ -49,7 +49,7 @@ struct dasm_State;
#endif #endif
#define BUILDDEF(_) \ #define BUILDDEF(_) \
_(asm) _(elfasm) _(coffasm) _(machasm) BUILDDEFX(_) _(raw) \ _(elfasm) _(coffasm) _(machasm) BUILDDEFX(_) _(raw) \
_(ffdef) _(libdef) _(recdef) _(vmdef) \ _(ffdef) _(libdef) _(recdef) _(vmdef) \
_(folddef) _(folddef)