Merge pull request #8235 from suvari/master

llvm: try to fix fistly build with gcc
This commit is contained in:
Kamil ATLI
2020-03-27 14:32:56 +03:00
committed by GitHub
2 changed files with 10 additions and 9 deletions
+8 -8
View File
@@ -40,19 +40,19 @@ def setup():
shelltools.system("tar xf ../compiler-rt-%s.src.tar.xz -C projects" % get.srcVERSION()) shelltools.system("tar xf ../compiler-rt-%s.src.tar.xz -C projects" % get.srcVERSION())
shelltools.move("projects/compiler-rt-%s.src" % get.srcVERSION(), "projects/compiler-rt") shelltools.move("projects/compiler-rt-%s.src" % get.srcVERSION(), "projects/compiler-rt")
shelltools.export("CC", "clang") #shelltools.export("CC", "clang")
shelltools.export("CXX", "clang++") #shelltools.export("CXX", "clang++")
#shelltools.export("CC", "gcc") shelltools.export("CC", "gcc")
#shelltools.export("CXX", "g++") shelltools.export("CXX", "g++")
else: else:
shelltools.system("tar xf ../clang-%s.src.tar.xz -C tools" % get.srcVERSION()) shelltools.system("tar xf ../clang-%s.src.tar.xz -C tools" % get.srcVERSION())
shelltools.move("tools/clang-%s.src" % get.srcVERSION(), "tools/clang") shelltools.move("tools/clang-%s.src" % get.srcVERSION(), "tools/clang")
if get.buildTYPE() == "emul32": if get.buildTYPE() == "emul32":
shelltools.export("CC", "clang -m32") #shelltools.export("CC", "clang -m32")
shelltools.export("CXX", "clang++ -m32") #shelltools.export("CXX", "clang++ -m32")
#shelltools.export("CC", "gcc -m32") shelltools.export("CC", "gcc -m32")
#shelltools.export("CXX", "g++ -m32") shelltools.export("CXX", "g++ -m32")
shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig") shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig")
shelltools.makedirs("build") shelltools.makedirs("build")
+2 -1
View File
@@ -31,7 +31,8 @@
<Dependency>cmake</Dependency> <Dependency>cmake</Dependency>
<!-- Use new plugin-api.h header file from binutils to enable LLVM gold plugin --> <!-- Use new plugin-api.h header file from binutils to enable LLVM gold plugin -->
<Dependency>binutils</Dependency> <Dependency>binutils</Dependency>
<Dependency>llvm-clang</Dependency> <Dependency>gcc</Dependency>
<!-- <Dependency>llvm-clang</Dependency> -->
<!-- <Dependency>lld</Dependency> --> <!-- <Dependency>lld</Dependency> -->
</BuildDependencies> </BuildDependencies>
</Source> </Source>