From 37ae24cdad9f7ab1b1af0f503ae7e3457d4b3a2b Mon Sep 17 00:00:00 2001 From: luna Date: Wed, 28 Sep 2022 18:45:22 +0800 Subject: Fix Linux driver multi-target build error --- xmake/rules/platform/linux/driver/driver_modules.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xmake/rules/platform/linux/driver/driver_modules.lua b/xmake/rules/platform/linux/driver/driver_modules.lua index 3dae19523..45f77d3a0 100644 --- a/xmake/rules/platform/linux/driver/driver_modules.lua +++ b/xmake/rules/platform/linux/driver/driver_modules.lua @@ -53,7 +53,7 @@ end -- get cflags from make function _get_cflags_from_make(target, sdkdir) - local key = target:plat() .. target:arch() + local key = sdkdir local cflags = memcache.get2("linux.driver", key, "cflags") local ldflags_o = memcache.get2("linux.driver", key, "ldflags_o") local ldflags_ko = memcache.get2("linux.driver", key, "ldflags_ko") @@ -179,6 +179,8 @@ module_exit(hello_exit); end os.tryrm(tmpdir) memcache.set2("linux.driver", key, "cflags", cflags or false) + memcache.set2("linux.driver", key, "ldflags_o", ldflags_o or false) + memcache.set2("linux.driver", key, "ldflags_ko", ldflags_ko or false) end return cflags or nil, ldflags_o or nil, ldflags_ko or nil end -- cgit v1.3.1 From 9edef99a1d49ddf1a315da77ae138529c561881e Mon Sep 17 00:00:00 2001 From: luna Date: Wed, 28 Sep 2022 20:31:49 +0800 Subject: Cache key add arch --- xmake/rules/platform/linux/driver/driver_modules.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmake/rules/platform/linux/driver/driver_modules.lua b/xmake/rules/platform/linux/driver/driver_modules.lua index 45f77d3a0..1771341d2 100644 --- a/xmake/rules/platform/linux/driver/driver_modules.lua +++ b/xmake/rules/platform/linux/driver/driver_modules.lua @@ -53,7 +53,7 @@ end -- get cflags from make function _get_cflags_from_make(target, sdkdir) - local key = sdkdir + local key = sdkdir .. target:arch() local cflags = memcache.get2("linux.driver", key, "cflags") local ldflags_o = memcache.get2("linux.driver", key, "ldflags_o") local ldflags_ko = memcache.get2("linux.driver", key, "ldflags_ko") -- cgit v1.3.1