diff options
| author | ruki <[email protected]> | 2017-03-30 17:47:13 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2017-03-30 17:47:13 +0800 |
| commit | 69dedaf1e157fc449f0c3f6b354d5c19169a1f5d (patch) | |
| tree | f425ce89fb6df24ed5775188fd3c18f153d8fe38 /core/makefile | |
| parent | e5683cb340572a6ba45143d94569be683974bf32 (diff) | |
check jit for old makefile
Diffstat (limited to 'core/makefile')
| -rw-r--r-- | core/makefile | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/core/makefile b/core/makefile index 6f4c61c81..10c4fd5e2 100644 --- a/core/makefile +++ b/core/makefile @@ -169,7 +169,7 @@ ARCH :=$(if $(findstring android,$(PLAT)),armv7,$(ARCH)) endif # debug -DEBUG :=$(if $(DEBUG),$(DEBUG),y) +DEBUG :=$(if $(DEBUG),$(DEBUG),n) # debug type DTYPE :=$(if $(findstring y,$(DEBUG)),d,r) @@ -273,11 +273,11 @@ base_LIBPATH := base_LIBNAMES := m dl pthread endif -# config luajit +# check jit compiler ifeq ($(PLAT),linux) -luajit_LIBNAMES := $(shell if [ -f "/etc/redhat-release" ]; then echo "luajit_rhel"; else echo "luajit"; fi ) +luajit_JIT :=$(shell if [ -f "/etc/redhat-release" ]; then echo "nojit"; else echo "jit"; fi ) else -luajit_LIBNAMES := luajit +luajit_JIT :=jit endif # select package directory @@ -462,19 +462,6 @@ config : .null @$(ECHO) "export tbox_INCFLAGS" >> .config.mak @$(ECHO) "export tbox_LIBFLAGS" >> .config.mak @$(ECHO) "" >> .config.mak - @$(ECHO) "LUAJIT =y" >> .config.mak - @$(ECHO) "luajit_INCPATH =" >> .config.mak - @$(ECHO) "luajit_LIBPATH =" >> .config.mak - @$(ECHO) "luajit_INCFLAGS =" >> .config.mak - @$(ECHO) "luajit_LIBFLAGS =" >> .config.mak - @$(ECHO) "luajit_LIBNAMES =$(luajit_LIBNAMES)" >> .config.mak - @$(ECHO) "export LUAJIT" >> .config.mak - @$(ECHO) "export luajit_INCPATH" >> .config.mak - @$(ECHO) "export luajit_LIBPATH" >> .config.mak - @$(ECHO) "export luajit_LIBNAMES" >> .config.mak - @$(ECHO) "export luajit_INCFLAGS" >> .config.mak - @$(ECHO) "export luajit_LIBFLAGS" >> .config.mak - @$(ECHO) "" >> .config.mak @$(ECHO) "BASE =y" >> .config.mak @$(ECHO) "base_INCPATH =" >> .config.mak @$(ECHO) "base_LIBPATH =$(base_LIBPATH)" >> .config.mak @@ -487,6 +474,9 @@ config : .null @$(ECHO) "export base_LIBNAMES" >> .config.mak @$(ECHO) "export base_INCFLAGS" >> .config.mak @$(ECHO) "export base_LIBFLAGS" >> .config.mak + @$(ECHO) "" >> .config.mak + @$(ECHO) "luajit_JIT =$(luajit_JIT)" >> .config.mak + @$(ECHO) "export luajit_JIT" >> .config.mak # ###################################################################################### # help |