Skip to contentSkip to conversation

package/llvm-project/clang: remove merge artifacts

PATCH In review Daniel Lang via buildroot 2 participants 3 messages Jun 2, 2025

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/llvm-project/clang: remove merge artifacts

Fixes:

    e29dae10 ("package/llvm-project: bump to version 20.1.5")
---
 package/llvm-project/clang/clang.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/llvm-project/clang/clang.mk +2 -2
index 25d5688a80..a5c8b990aa 100644
@@ -67,8 +67,8 @@ CLANG_CONF_OPTS += -DLLVM_DIR=$(STAGING_DIR)/usr/lib/cmake/llvm \
 HOST_CLANG_CONF_OPTS += -DLLVM_COMMON_CMAKE_UTILS=$(HOST_DIR)/lib/cmake/llvm
 CLANG_CONF_OPTS += -DLLVM_COMMON_CMAKE_UTILS=$(HOST_DIR)/lib/cmake/llvm
 
-+HOST_CLANG_CONF_OPTS += -DLLVM_MAIN_SRC_DIR=$(BUILD_DIR)/llvm-$(LLVM_PROJECT_VERSION)
-+CLANG_CONF_OPTS += -DLLVM_MAIN_SRC_DIR=$(BUILD_DIR)/llvm-$(LLVM_PROJECT_VERSION)
+HOST_CLANG_CONF_OPTS += -DLLVM_MAIN_SRC_DIR=$(BUILD_DIR)/llvm-$(LLVM_PROJECT_VERSION)
+CLANG_CONF_OPTS += -DLLVM_MAIN_SRC_DIR=$(BUILD_DIR)/llvm-$(LLVM_PROJECT_VERSION)
 
 # Clang can't be used as compiler on the target since there are no
 # development files (headers) and other build tools. So remove clang
Signature · 6 lines
2.49.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot