diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-02-28 18:05:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-28 18:05:41 +0000 |
| commit | bfb0bc0461ee8448e233dfe2a374a3e9fef14512 (patch) | |
| tree | 7dbbe73332c994dba4430413bfcbafbde77376fe /pkgs/development/compilers | |
| parent | e71c1249e8054c77368ee60a7fd6edb19e7fe426 (diff) | |
| parent | 93a789543ae6b5831ae8040532202caa927f314c (diff) | |
| download | nixpkgs-bfb0bc0461ee8448e233dfe2a374a3e9fef14512.tar nixpkgs-bfb0bc0461ee8448e233dfe2a374a3e9fef14512.tar.gz nixpkgs-bfb0bc0461ee8448e233dfe2a374a3e9fef14512.tar.bz2 nixpkgs-bfb0bc0461ee8448e233dfe2a374a3e9fef14512.tar.lz nixpkgs-bfb0bc0461ee8448e233dfe2a374a3e9fef14512.tar.xz nixpkgs-bfb0bc0461ee8448e233dfe2a374a3e9fef14512.tar.zst nixpkgs-bfb0bc0461ee8448e233dfe2a374a3e9fef14512.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/llvm/14/lld/fix-root-src-dir.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/compilers/llvm/14/lld/fix-root-src-dir.patch b/pkgs/development/compilers/llvm/14/lld/fix-root-src-dir.patch index 26ecef25649..38fb965b472 100644 --- a/pkgs/development/compilers/llvm/14/lld/fix-root-src-dir.patch +++ b/pkgs/development/compilers/llvm/14/lld/fix-root-src-dir.patch @@ -1,13 +1,13 @@ -diff --git a/lld/CMakeLists.txt b/lld/CMakeLists.txt -index e1a29b884d17..9d542f8fbfc1 100644 +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9bcc135665d0..d38679ed41e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -64,7 +64,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - - set(LLVM_MAIN_INCLUDE_DIR ${MAIN_INCLUDE_DIR} CACHE PATH "Path to llvm/include") - set(LLVM_BINARY_DIR ${LLVM_OBJ_ROOT} CACHE PATH "Path to LLVM build tree") -- set(LLVM_MAIN_SRC_DIR ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM source tree") +@@ -74,7 +74,7 @@ if(LLD_BUILT_STANDALONE) + + set(LLVM_MAIN_INCLUDE_DIR "${MAIN_INCLUDE_DIR}" CACHE PATH "Path to llvm/include") + set(LLVM_BINARY_DIR "${LLVM_OBJ_ROOT}" CACHE PATH "Path to LLVM build tree") +- set(LLVM_MAIN_SRC_DIR "${MAIN_SRC_DIR}" CACHE PATH "Path to LLVM source tree") + set(LLVM_MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm" CACHE PATH "Path to LLVM source tree") - + find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) |