Another fix

ClickHouse · Oct 29, 2019 · 435dc19 · 435dc19
1 parent d58e782
commit 435dc19
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/docker/packager/packager b/docker/packager/packager
@@ -107,7 +107,12 @@ def parse_env_variables(build_type, compiler, sanitizer, package_type, cache, di
     result = []
     cmake_flags = ['$CMAKE_FLAGS', '-DADD_GDB_INDEX_FOR_GOLD=1']
 
-    if "clang" in compiler:
+    is_clang = "clang" in compiler
+    is_cross_compile = ("darwin" in compiler) or ("aarch64" in compiler)
+
+    # Explicitly use LLD with Clang by default.
+    # Don't force linker for cross-compilation.
+    if is_clang and not is_cross_compile:
         cmake_flags = ['$CMAKE_FLAGS', '-DLINKER_NAME=lld']
 
     if compiler.endswith("-darwin"):