From 5dd175b080e78c4587408696d9ec3cb77b88d0bb Mon Sep 17 00:00:00 2001 From: Renato Maia Date: Tue, 22 Apr 2025 22:10:35 -0300 Subject: fix: avoid overwriting CMake variables from rockspec --- src/luarocks/build/cmake.lua | 5 ----- src/luarocks/build/cmake.tl | 5 ----- 2 files changed, 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) local build = rockspec.build local variables = build.variables or {} - - variables.CMAKE_MODULE_PATH = os.getenv("CMAKE_MODULE_PATH") - variables.CMAKE_LIBRARY_PATH = os.getenv("CMAKE_LIBRARY_PATH") - variables.CMAKE_INCLUDE_PATH = os.getenv("CMAKE_INCLUDE_PATH") - util.variable_substitutions(variables, rockspec.variables) 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 local build = rockspec.build as cmake.CMakeBuild local variables = build.variables or {} - -- Pass Env variables - variables.CMAKE_MODULE_PATH=os.getenv("CMAKE_MODULE_PATH") - variables.CMAKE_LIBRARY_PATH=os.getenv("CMAKE_LIBRARY_PATH") - variables.CMAKE_INCLUDE_PATH=os.getenv("CMAKE_INCLUDE_PATH") - util.variable_substitutions(variables, rockspec.variables) local ok, err_msg = fs.is_tool_available(rockspec.variables.CMAKE, "CMake") -- cgit v1.2.3-55-g6feb