aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRenato Maia <maia.renato@gmail.com>2025-04-22 22:10:35 -0300
committerHisham Muhammad <hisham@gobolinux.org>2025-05-19 11:31:25 -0300
commit5dd175b080e78c4587408696d9ec3cb77b88d0bb (patch)
tree455bd9b7c0d4468ee6762968ab938f19a6bbbf1d
parent3b7bf479568790a8b04772a36c1b3e712fed4579 (diff)
downloadluarocks-5dd175b080e78c4587408696d9ec3cb77b88d0bb.tar.gz
luarocks-5dd175b080e78c4587408696d9ec3cb77b88d0bb.tar.bz2
luarocks-5dd175b080e78c4587408696d9ec3cb77b88d0bb.zip
fix: avoid overwriting CMake variables from rockspec
-rw-r--r--src/luarocks/build/cmake.lua5
-rw-r--r--src/luarocks/build/cmake.tl5
2 files changed, 0 insertions, 10 deletions
diff --git a/src/luarocks/build/cmake.lua b/src/luarocks/build/cmake.lua
index ea132a3e..b9954cf4 100644
--- a/src/luarocks/build/cmake.lua
+++ b/src/luarocks/build/cmake.lua
@@ -27,11 +27,6 @@ function cmake.run(rockspec, no_install)
27 local build = rockspec.build 27 local build = rockspec.build
28 local variables = build.variables or {} 28 local variables = build.variables or {}
29 29
30
31 variables.CMAKE_MODULE_PATH = os.getenv("CMAKE_MODULE_PATH")
32 variables.CMAKE_LIBRARY_PATH = os.getenv("CMAKE_LIBRARY_PATH")
33 variables.CMAKE_INCLUDE_PATH = os.getenv("CMAKE_INCLUDE_PATH")
34
35 util.variable_substitutions(variables, rockspec.variables) 30 util.variable_substitutions(variables, rockspec.variables)
36 31
37 local ok, err_msg = fs.is_tool_available(rockspec.variables.CMAKE, "CMake") 32 local ok, err_msg = fs.is_tool_available(rockspec.variables.CMAKE, "CMake")
diff --git a/src/luarocks/build/cmake.tl b/src/luarocks/build/cmake.tl
index 9a512d1e..35e64bd6 100644
--- a/src/luarocks/build/cmake.tl
+++ b/src/luarocks/build/cmake.tl
@@ -27,11 +27,6 @@ function cmake.run(rockspec: Rockspec, no_install: boolean): boolean, string, st
27 local build = rockspec.build as cmake.CMakeBuild 27 local build = rockspec.build as cmake.CMakeBuild
28 local variables = build.variables or {} 28 local variables = build.variables or {}
29 29
30 -- Pass Env variables
31 variables.CMAKE_MODULE_PATH=os.getenv("CMAKE_MODULE_PATH")
32 variables.CMAKE_LIBRARY_PATH=os.getenv("CMAKE_LIBRARY_PATH")
33 variables.CMAKE_INCLUDE_PATH=os.getenv("CMAKE_INCLUDE_PATH")
34
35 util.variable_substitutions(variables, rockspec.variables) 30 util.variable_substitutions(variables, rockspec.variables)
36 31
37 local ok, err_msg = fs.is_tool_available(rockspec.variables.CMAKE, "CMake") 32 local ok, err_msg = fs.is_tool_available(rockspec.variables.CMAKE, "CMake")