mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-01 09:44:18 +00:00
6cf3ec0947
Contains the combined single-commit work by both @jnetod and myself from NixOS/nixpkgs#122665. Brings the build up to LLVM 10, switches to `symlinkJoin` for putting Clang where the CMake build expects it, and updates to a fresh update of Terra that works around a few LLVM bugs.
14 lines
418 B
Diff
14 lines
418 B
Diff
diff --git a/cmake/Modules/GetLuaJIT.cmake b/cmake/Modules/GetLuaJIT.cmake
|
|
index 023b5c2..8564b92 100644
|
|
--- a/cmake/Modules/GetLuaJIT.cmake
|
|
+++ b/cmake/Modules/GetLuaJIT.cmake
|
|
@@ -63,8 +63,6 @@ string(CONCAT
|
|
"${CMAKE_SHARED_LIBRARY_SUFFIX}"
|
|
)
|
|
|
|
-file(DOWNLOAD "${LUAJIT_URL}" "${LUAJIT_TAR}")
|
|
-
|
|
execute_process(
|
|
COMMAND "${CMAKE_COMMAND}" -E tar xzf "${LUAJIT_TAR}"
|
|
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
|