diff options
| -rw-r--r-- | core/makefile | 10 | ||||
| -rw-r--r-- | core/src/xmake/machine.c | 10 |
2 files changed, 9 insertions, 11 deletions
diff --git a/core/makefile b/core/makefile index dbd04474c..4551ae0b1 100644 --- a/core/makefile +++ b/core/makefile @@ -216,18 +216,8 @@ TOOL_DIR := $(PRO_DIR)/tool CXFLAG := $(if $(CXFLAG),$(CXFLAG),) # ccache -ifeq ($(CCACHE),n) CCACHE := -else -CCACHE :=$(shell if [ -f "/usr/bin/ccache" ]; then echo "ccache"; elif [ -f "/usr/local/bin/ccache" ]; then echo "ccache"; else echo ""; fi ) -endif - -# distcc -ifeq ($(DISTCC),y) -DISTCC :=$(shell if [ -f "/usr/bin/distcc" ]; then echo "distcc"; elif [ -f "/usr/local/bin/distcc" ]; then echo "distcc"; else echo ""; fi ) -else DISTCC := -endif # sed ifeq ($(HOST),macosx) diff --git a/core/src/xmake/machine.c b/core/src/xmake/machine.c index 09c496eaf..ad1c4d366 100644 --- a/core/src/xmake/machine.c +++ b/core/src/xmake/machine.c @@ -505,10 +505,18 @@ xm_machine_ref_t xm_machine_init() lua_setglobal(impl->lua, "_HOST"); // init architecture -#if defined(TB_ARCH_x86) || defined(TB_CONFIG_OS_WINDOWS) +#if defined(TB_ARCH_x86) +# ifdef TB_CONFIG_OS_WINDOWS + lua_pushstring(impl->lua, "x86"); +# else lua_pushstring(impl->lua, "i386"); +# endif #elif defined(TB_ARCH_x64) +# ifdef TB_CONFIG_OS_WINDOWS + lua_pushstring(impl->lua, "x64"); +# else lua_pushstring(impl->lua, "x86_64"); +# endif #else lua_pushstring(impl->lua, TB_ARCH_STRING); #endif |