Skip to content

Commit b77aadc

Browse files
committed
fix: xmake, even tho 'buildir' is deprecated, 'builddir' does't work correctly sometimes.
1 parent e92aa9b commit b77aadc

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

xmake.lua

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@ function setup_release()
135135
end
136136

137137
local function setup_build_folder()
138-
set_targetdir("$(builddir)/$(mode)/$(arch)-$(os)-" .. abi .. "/bin")
139-
set_objectdir("$(builddir)/.resolver")
140-
set_dependir ("$(builddir)/.shared")
138+
set_targetdir("$(buildir)/$(mode)/$(arch)-$(os)-" .. abi .. "/bin")
139+
set_objectdir("$(buildir)/.resolver")
140+
set_dependir ("$(buildir)/.shared")
141141
end
142142

143143
local function setup_env()
@@ -487,10 +487,6 @@ package("llvm-clang")
487487
on_test(function (package)
488488
return checkLlvm()
489489
end)
490-
491-
on_check(function (package)
492-
return checkLlvm()
493-
end)
494490
package_end()
495491

496492

@@ -567,7 +563,7 @@ target_end() -- empty target
567563

568564
target("helix-api")
569565
set_kind("static")
570-
set_targetdir("$(builddir)/$(mode)/$(arch)-$(os)-" .. abi)
566+
set_targetdir("$(buildir)/$(mode)/$(arch)-$(os)-" .. abi)
571567

572568
after_build(function(target) -- make the helix library with all the appropriate header files
573569
-- determine the target output directory

0 commit comments

Comments
 (0)