diff --git a/programming/build/llvm/actions.py b/programming/build/llvm/actions.py index 773903f4b2..54409585df 100644 --- a/programming/build/llvm/actions.py +++ b/programming/build/llvm/actions.py @@ -23,32 +23,32 @@ 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") - #pisitools.cflags.add("-mllvm -polly -Wno-unused-command-line-argument") - #pisitools.cxxflags.add("-mllvm -polly -Wno-unused-command-line-argument") - #shelltools.export("CC", "clang") - #shelltools.export("CXX", "clang++") - #shelltools.export("AR", "llvm-ar") - #shelltools.export("NM", "llvm-nm") - #shelltools.export("RANLIB", "llvm-ranlib") + pisitools.ldflags.add("-fuse-ld=lld") + pisitools.cflags.remove("-D_FORTIFY_SOURCE=2") + pisitools.cxxflags.remove("-D_FORTIFY_SOURCE=2") + pisitools.cflags.add("-mllvm -polly -Wno-unused-command-line-argument") + pisitools.cxxflags.add("-mllvm -polly -Wno-unused-command-line-argument") + shelltools.export("CC", "clang") + shelltools.export("CXX", "clang++") + shelltools.export("AR", "llvm-ar") + shelltools.export("NM", "llvm-nm") + shelltools.export("RANLIB", "llvm-ranlib") if get.buildTYPE() == "emul32": - shelltools.export("CC", "gcc -m32") - shelltools.export("CXX", "g++ -m32") - #shelltools.export("CC", "clang -m32") - #shelltools.export("CXX", "clang++ -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") #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++") + #else: + #shelltools.export("CC", "gcc") + #shelltools.export("CXX", "g++") #shelltools.export("CC", "clang") #shelltools.export("CXX", "clang++") @@ -65,8 +65,8 @@ def setup(): if get.buildTYPE() == "emul32": - shelltools.export("CC", "gcc -m32") - shelltools.export("CXX", "g++ -m32") + #shelltools.export("CC", "gcc -m32") + #shelltools.export("CXX", "g++ -m32") pisitools.cflags.add("-m32 ") pisitools.cxxflags.add("-m32") shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig") @@ -78,6 +78,9 @@ def setup(): cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \ -G 'Unix Makefiles' \ %s \ + -DCMAKE_AR=/usr/bin/llvm-ar \ + -DCMAKE_NM=/usr/bin/llvm-nm \ + -DCMAKE_RANLIB=/usr/bin/llvm-ranlib \ -DLLVM_ENABLE_PROJECTS='%s' \ -DLLVM_LIBDIR_SUFFIX=%s \ -DLLVM_ENABLE_FFI=ON \