diff --git a/3rd/EmmyLuaCodeStyle b/3rd/EmmyLuaCodeStyle index 108273ada..e885ab119 160000 --- a/3rd/EmmyLuaCodeStyle +++ b/3rd/EmmyLuaCodeStyle @@ -1 +1 @@ -Subproject commit 108273ada6c0d6a888c5f5975339478f9ce32e83 +Subproject commit e885ab119c31155696ed513fc00b702cc1710ddb diff --git a/make.lua b/make.lua index 7b939b8de..6a74809c8 100644 --- a/make.lua +++ b/make.lua @@ -32,16 +32,13 @@ elseif platform.OS == 'Linux' then elseif lm.platform == "linux-x64" then elseif lm.platform == "linux-arm64" then lm.cc = 'aarch64-linux-gnu-gcc' - includeCodeFormat = false else error "unknown platform" end end lm:import "3rd/bee.lua/make.lua" -if includeCodeFormat then - lm:import "make/code_format.lua" -end +lm:import "make/code_format.lua" lm:source_set 'lpeglabel' { rootdir = '3rd', diff --git a/make/code_format.lua b/make/code_format.lua index 17007fdda..48e4c80fc 100644 --- a/make/code_format.lua +++ b/make/code_format.lua @@ -22,6 +22,13 @@ lm:source_set 'code_format' { }, macos = { -- macosx10.12不支持完整的std filesystem,只好砍功能 - defines = "NOT_SURPPORT_FILE_SYSTEM", + defines = "NOT_SUPPORT_FILE_SYSTEM", }, + linux = { + defines = (function () + if lm.platform == "linux-arm64" then + return "NOT_SUPPORT_FILE_SYSTEM" + end + end)() + } }