diff options
| author | ruki <[email protected]> | 2019-03-28 22:46:25 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2019-03-28 10:38:32 +0800 |
| commit | ca1668be5f36ddbb082ea52d77585645b9739f48 (patch) | |
| tree | 9fa5b73fab0523799859d9cd79bb38cb13c66971 | |
| parent | 824b43fabb20842e645849653250cc64d77025ac (diff) | |
improve project config directory
| -rw-r--r-- | xmake/core/project/config.lua | 2 | ||||
| -rw-r--r-- | xmake/core/sandbox/modules/import/lib/detect/find_program.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xmake/core/project/config.lua b/xmake/core/project/config.lua index 789d2f5fd..03dd50119 100644 --- a/xmake/core/project/config.lua +++ b/xmake/core/project/config.lua @@ -152,7 +152,7 @@ end -- get the configure directory function config.directory() if config._ROOTDIR == nil then - config._ROOTDIR = os.getenv("XMAKE_CONFIGDIR") or path.join(os.projectdir(), ".xmake") + config._ROOTDIR = os.getenv("XMAKE_CONFIGDIR") or path.join(os.projectdir(), ".xmake", os.host(), os.arch()) end return config._ROOTDIR end diff --git a/xmake/core/sandbox/modules/import/lib/detect/find_program.lua b/xmake/core/sandbox/modules/import/lib/detect/find_program.lua index 7a7ff9548..1cb1c1a81 100644 --- a/xmake/core/sandbox/modules/import/lib/detect/find_program.lua +++ b/xmake/core/sandbox/modules/import/lib/detect/find_program.lua @@ -248,7 +248,7 @@ function sandbox_lib_detect_find_program.main(name, opt) opt = opt or {} -- init cachekey - local cachekey = "find_program_" .. os.host() .. "_" .. os.arch() + local cachekey = "find_program" if opt.cachekey then cachekey = cachekey .. "_" .. opt.cachekey end |