summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xmake/core/package/package.lua2
-rw-r--r--xmake/modules/private/action/require/impl/actions/install.lua2
2 files changed, 2 insertions, 2 deletions
diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua
index e86d87ce6..fa409aace 100644
--- a/xmake/core/package/package.lua
+++ b/xmake/core/package/package.lua
@@ -814,7 +814,7 @@ function _instance:rulesdir()
if not os.isdir(rulesdir) and self:base() then
rulesdir = self:base():rulesdir()
end
- if not os.isdir(rulesdir) then
+ if rulesdir == nil or not os.isdir(rulesdir) then
rulesdir = false
end
self._RULESDIR = rulesdir
diff --git a/xmake/modules/private/action/require/impl/actions/install.lua b/xmake/modules/private/action/require/impl/actions/install.lua
index bd6176463..0a0060511 100644
--- a/xmake/modules/private/action/require/impl/actions/install.lua
+++ b/xmake/modules/private/action/require/impl/actions/install.lua
@@ -366,7 +366,7 @@ function main(package)
-- install rules
local rulesdir = package:rulesdir()
- if os.isdir(rulesdir) then
+ if rulesdir and os.isdir(rulesdir) then
os.cp(rulesdir, package:installdir())
end