llvm rebuild

This commit is contained in:
Rmys
2021-02-22 17:51:57 +03:00
committed by GitHub
parent 4b22e9249b
commit 6f091769b4
2 changed files with 15 additions and 16 deletions
+10 -10
View File
@@ -19,11 +19,11 @@ NoStrip = ["/usr/lib/clang/%s/lib/linux" % get.srcVERSION()]
WorkDir = "llvm-project-%s.src/llvm" % get.srcVERSION() WorkDir = "llvm-project-%s.src/llvm" % get.srcVERSION()
def setup(): def setup():
pisitools.ldflags.add("-fuse-ld=lld -rtlib=compiler-rt -stdlib=libc++") #pisitools.ldflags.add("-fuse-ld=lld -rtlib=compiler-rt -stdlib=libc++")
pisitools.cflags.remove("-D_FORTIFY_SOURCE=2") #pisitools.cflags.remove("-D_FORTIFY_SOURCE=2")
pisitools.cxxflags.remove("-D_FORTIFY_SOURCE=2") #pisitools.cxxflags.remove("-D_FORTIFY_SOURCE=2")
shelltools.export("CC", "clang") #shelltools.export("CC", "clang")
shelltools.export("CXX", "clang++") #shelltools.export("CXX", "clang++")
#if get.buildTYPE() == "emul32": #if get.buildTYPE() == "emul32":
@@ -42,22 +42,24 @@ def setup():
#shelltools.export("CXX", "g++") #shelltools.export("CXX", "g++")
#shelltools.export("CC", "clang") #shelltools.export("CC", "clang")
#shelltools.export("CXX", "clang++") #shelltools.export("CXX", "clang++")
shelltools.makedirs("build") shelltools.makedirs("build")
shelltools.cd("build") shelltools.cd("build")
if get.buildTYPE() != "emul32": if get.buildTYPE() != "emul32":
pisitools.cflags.add("-m64 ") pisitools.cflags.add("-m64 ")
pisitools.cxxflags.add("-m64 -stdlib=libc++") pisitools.cxxflags.add("-m64")
options = "-DLLVM_TARGET_ARCH:STRING=x86_64 \ options = "-DLLVM_TARGET_ARCH:STRING=x86_64 \
-DLLDB_ENABLE_LUA=OFF \ -DLLDB_ENABLE_LUA=OFF \
-DLLVM_DEFAULT_TARGET_TRIPLE=%s " % get.HOST() -DLLVM_DEFAULT_TARGET_TRIPLE=%s " % get.HOST()
if get.buildTYPE() == "emul32": if get.buildTYPE() == "emul32":
shelltools.export("CC", "gcc -m32")
shelltools.export("CXX", "g++ -m32")
pisitools.cflags.add("-m32 ") pisitools.cflags.add("-m32 ")
pisitools.cxxflags.add("-m32 -stdlib=libc++") pisitools.cxxflags.add("-m32")
shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig") shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig")
options = " -DCMAKE_INSTALL_PREFIX=/emul32 \ options = " -DCMAKE_INSTALL_PREFIX=/emul32 \
-DLLVM_TARGET_ARCH:STRING=i686 \ -DLLVM_TARGET_ARCH:STRING=i686 \
@@ -78,8 +80,6 @@ def setup():
-DLLVM_INCLUDEDIR=/usr/include \ -DLLVM_INCLUDEDIR=/usr/include \
-DLLVM_ENABLE_ASSERTIONS=OFF \ -DLLVM_ENABLE_ASSERTIONS=OFF \
-DFFI_INCLUDE_DIR=/usr/include \ -DFFI_INCLUDE_DIR=/usr/include \
-DLLVM_ENABLE_LIBCXX=ON \
-DLLVM_VERSION_SUFFIX='libcxx' \
-DCOMPILER_RT_USE_LIBCXX=OFF" % (options, projects, libsuffix), sourceDir=".." ) -DCOMPILER_RT_USE_LIBCXX=OFF" % (options, projects, libsuffix), sourceDir=".." )
def build(): def build():
+5 -6
View File
@@ -27,11 +27,11 @@
<!-- 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>gcc</Dependency> <Dependency>gcc</Dependency>
<Dependency>llvm</Dependency> <!--Dependency>llvm</Dependency>
<Dependency>llvm-clang-devel</Dependency> <Dependency>llvm-clang-devel</Dependency>
<Dependency>lld</Dependency> <Dependency>lld</Dependency-->
<Dependency>libcxx-devel</Dependency> <!--Dependency>libcxx-devel</Dependency-->
<Dependency>compiler-rt</Dependency> <!--Dependency>compiler-rt</Dependency-->
</BuildDependencies> </BuildDependencies>
<!--<AdditionalFiles> <!--<AdditionalFiles>
<AdditionalFile owner="root" permission="0644" target="../support-linking-ScopPassManager-against-LLVM-dylib.patch">support-linking-ScopPassManager-against-LLVM-dylib.patch</AdditionalFile> <AdditionalFile owner="root" permission="0644" target="../support-linking-ScopPassManager-against-LLVM-dylib.patch">support-linking-ScopPassManager-against-LLVM-dylib.patch</AdditionalFile>
@@ -276,7 +276,7 @@
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="library">/usr/lib/LLVMPolly.so</Path> <Path fileType="library">/usr/lib/LLVMPolly.so</Path>
<Path fileType="library">/usr/lib/libPolly*.a*</Path> <Path fileType="library">/usr/lib/libPolly*.so*</Path>
<Path fileType="header">/usr/include/polly</Path> <Path fileType="header">/usr/include/polly</Path>
<Path fileType="data">/usr/lib/cmake/polly</Path> <Path fileType="data">/usr/lib/cmake/polly</Path>
</Files> </Files>
@@ -299,7 +299,6 @@
<Summary>32-bit shared libraries for llvm</Summary> <Summary>32-bit shared libraries for llvm</Summary>
<BuildType>emul32</BuildType> <BuildType>emul32</BuildType>
<BuildDependencies> <BuildDependencies>
<!-- <Dependency>llvm-32bit</Dependency> -->
<Dependency>zlib-32bit</Dependency> <Dependency>zlib-32bit</Dependency>
<Dependency>libffi-32bit</Dependency> <Dependency>libffi-32bit</Dependency>
<Dependency>libxml2-32bit</Dependency> <Dependency>libxml2-32bit</Dependency>