From 507917b42e262469cb98fb119ca52dd9e656083f Mon Sep 17 00:00:00 2001
From: Marko Semet <marko@marko10-000.de>
Date: Sun, 7 Nov 2021 16:32:46 +0100
Subject: [PATCH] LLVM fix ld gold plugin support

---
 .../com.vscodium.codium.tool.LLVM.yaml        | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/com.vscodium.codium/tool.LLVM/com.vscodium.codium.tool.LLVM.yaml b/com.vscodium.codium/tool.LLVM/com.vscodium.codium.tool.LLVM.yaml
index ff3c775..4b570d5 100644
--- a/com.vscodium.codium/tool.LLVM/com.vscodium.codium.tool.LLVM.yaml
+++ b/com.vscodium.codium/tool.LLVM/com.vscodium.codium.tool.LLVM.yaml
@@ -30,11 +30,12 @@ modules:
             - -DLLVM_INSTALL_UTILS=ON
             - -DLLVM_ENABLE_RTTI=ON
             - -DLLVM_ENABLE_FFI=ON
+            - -DLLVM_BINUTILS_INCDIR=/usr/include
         post-install:
-            - find /app/tools/LLVM/tmp -type -f | xargs -I{} strip -g {} || true
+            - find /app/tools/LLVM/tmp -type f | xargs -I{} strip -g {} || true
         cleanup:
             - "*"
-    -   name: llvm
+    -   name: llvm2
         sources: *LLVM
         buildsystem: cmake-ninja
         builddir: true
@@ -42,19 +43,17 @@ modules:
         config-opts:
             - -DCMAKE_BUILD_TYPE=MinSizeRel
             - -DCMAKE_INSTALL_PREFIX=/app/tools/LLVM
-            - -DLLVM_ENABLE_PROJECTS="clang;clang;clang-tools-extra;compiler-rt;cross-project-tests;flang;libc;libclc;libcxx;libcxxabi;libunwind;lld;lldb;mlir;openmp;parallel-libs;polly;pstl"
+            - -DLLVM_ENABLE_PROJECTS="clang;clang;clang-tools-extra;compiler-rt;flang;libc;libclc;libcxx;libcxxabi;libunwind;lld;lldb;mlir;openmp;parallel-libs;polly;pstl"
             - -DLLVM_BUILD_LLVM_DYLIB=ON
             - -DLLVM_LINK_LLVM_DYLIB=ON
             - -DLLVM_INSTALL_UTILS=ON
             - -DLLVM_ENABLE_RTTI=ON
             - -DLLVM_ENABLE_FFI=ON
+            - -DLLVM_BINUTILS_INCDIR=/usr/include
         build-options:
-            cflags: -flto -Oz
-            cxxflags: -flto -Oz
             env:
-                cc: /app/tools/LLVM/tmp/bin/clang
-                cxx: /app/tools/LLVM/tmp/bin/clang++
-                ld: /app/tools/LLVM/tmp/bin/lld
-            ldflags: -flto -Oz
+                CC: /app/tools/LLVM/tmp/bin/clang
+                CXX: /app/tools/LLVM/tmp/bin/clang++
+                LD: /app/tools/LLVM/tmp/bin/clang
         post-install:
-            - find /app/tools/LLVM/bin /app/tools/LLVM/lib -type -f | xargs -I{} strip -g {} || true
+            - find /app/tools/LLVM/bin /app/tools/LLVM/lib -type f | xargs -I{} strip -g {} || true