From 0947ae7cf3d9fa08a0054f2615df204c31da464f Mon Sep 17 00:00:00 2001
From: Idris Kalp <idriskalp@gmail.com>
Date: Sat, 5 Jun 2021 00:46:19 +0300
Subject: [PATCH] llvm build with gcc

---
 programming/build/llvm/actions.py | 20 ++++++++++----------
 programming/build/llvm/pspec.xml  |  8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/programming/build/llvm/actions.py b/programming/build/llvm/actions.py
index d11b977fe4..9216fc5aed 100644
--- a/programming/build/llvm/actions.py
+++ b/programming/build/llvm/actions.py
@@ -23,27 +23,27 @@ NoStrip = ["/usr/lib/clang/%s/lib/linux" % get.srcVERSION()]
 WorkDir = "llvm-project-%s.src/llvm" % get.srcVERSION()
 
 def setup():
-    pisitools.ldflags.add("-fuse-ld=lld")
-    pisitools.cflags.remove("-D_FORTIFY_SOURCE=2")
-    pisitools.cxxflags.remove("-D_FORTIFY_SOURCE=2")
-    shelltools.export("CC", "clang")
-    shelltools.export("CXX", "clang++")
+    #pisitools.ldflags.add("-fuse-ld=lld")
+    #pisitools.cflags.remove("-D_FORTIFY_SOURCE=2")
+    #pisitools.cxxflags.remove("-D_FORTIFY_SOURCE=2")
+    #shelltools.export("CC", "clang")
+    #shelltools.export("CXX", "clang++")
     
 
     #if get.buildTYPE() == "emul32":
-        #shelltools.export("CC", "gcc -m32")
-        #shelltools.export("CXX", "g++ -m32")
+        shelltools.export("CC", "gcc -m32")
+        shelltools.export("CXX", "g++ -m32")
         #shelltools.export("CC", "clang -m32")
         #shelltools.export("CXX", "clang++ -m32")
-        #shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig")
+        shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig")
         
         #clang patch
         #shelltools.cd("tools")
         #shelltools.system("patch -p1 < enable-SSP-and-PIE-by-default.patch")
         #shelltools.cd("..")
     #else:
-        #shelltools.export("CC", "gcc")
-        #shelltools.export("CXX", "g++")
+        shelltools.export("CC", "gcc")
+        shelltools.export("CXX", "g++")
         #shelltools.export("CC", "clang")
         #shelltools.export("CXX", "clang++")
 
diff --git a/programming/build/llvm/pspec.xml b/programming/build/llvm/pspec.xml
index bfaff149ad..e519c718b0 100755
--- a/programming/build/llvm/pspec.xml
+++ b/programming/build/llvm/pspec.xml
@@ -25,12 +25,12 @@
             <Dependency versionFrom="3.18.3">cmake</Dependency>
             <Dependency versionFrom="3.8.6">python3-devel</Dependency>
             <!-- Use new plugin-api.h header file from binutils to enable LLVM gold plugin -->
-            <!--<Dependency>binutils</Dependency>
-            <Dependency>gcc</Dependency>-->
-            <Dependency>llvm</Dependency>
+            <Dependency>binutils</Dependency>
+            <Dependency>gcc</Dependency>
+<!--            <Dependency>llvm</Dependency>
             <Dependency>llvm-clang-devel</Dependency>
             <Dependency>lld</Dependency> 
-            <Dependency>llvm-polly</Dependency> 
+            <Dependency>llvm-polly</Dependency> -->
         </BuildDependencies>
         <!--<AdditionalFiles>
             <AdditionalFile owner="root" permission="0644" target="../support-linking-ScopPassManager-against-LLVM-dylib.patch">support-linking-ScopPassManager-against-LLVM-dylib.patch</AdditionalFile>