aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1154 from Shishpan/fixNewLLVMBuildSystem

Browse Source 
temp fix for new llvm cmake build system, without gcc-toolchain & some keys
This commit is contained in:
Dmitry Babokin
2016-01-29 21:47:54 +03:00
parent ccd8592e46 4e3d8540ff
commit 1370596c5e
1 changed files with 50 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
alloy.py
View File

@@ -247,6 +247,14 @@ def build_LLVM(version_LLVM, revision, folder, tarball, debug, selfbuild, extra,
os.makedirs(LLVM_BUILD_selfbuild) os.makedirs(LLVM_BUILD_selfbuild)
os.makedirs(LLVM_BIN_selfbuild) os.makedirs(LLVM_BIN_selfbuild)
os.chdir(LLVM_BUILD_selfbuild) os.chdir(LLVM_BUILD_selfbuild)
if version_LLVM == "trunk":
try_do_LLVM("configure release version for selfbuild ",
"cmake -G Unix\ Makefiles" + " -DCMAKE_EXPORT_COMPILE_COMMANDS=ON" +
selfbuild_compiler +
" -DCMAKE_INSTALL_PREFIX=" + llvm_home + "/" + LLVM_BIN_selfbuild +
" -DCMAKE_BUILD_TYPE:STRING=Release" + " ../" + LLVM_SRC,
from_validation)
else:
try_do_LLVM("configure release version for selfbuild ", try_do_LLVM("configure release version for selfbuild ",
"../" + LLVM_SRC + "/configure --prefix=" + llvm_home + "/" + "../" + LLVM_SRC + "/configure --prefix=" + llvm_home + "/" +
LLVM_BIN_selfbuild + " --enable-optimized" + LLVM_BIN_selfbuild + " --enable-optimized" +
@@ -260,12 +268,25 @@ def build_LLVM(version_LLVM, revision, folder, tarball, debug, selfbuild, extra,
"make install", "make install",
from_validation) from_validation)
os.chdir("../") os.chdir("../")
if version_LLVM == "trunk":
selfbuild_compiler = (" -DCMAKE_C_COMPILER=" +llvm_home+ "/" + LLVM_BIN_selfbuild + "/bin/clang " +
" -DCMAKE_CXX_COMPILER="+llvm_home+ "/" + LLVM_BIN_selfbuild + "/bin/clang++ ")
else:
selfbuild_compiler = ("CC=" +llvm_home+ "/" + LLVM_BIN_selfbuild + "/bin/clang " + selfbuild_compiler = ("CC=" +llvm_home+ "/" + LLVM_BIN_selfbuild + "/bin/clang " +
"CXX="+llvm_home+ "/" + LLVM_BIN_selfbuild + "/bin/clang++ ") "CXX="+llvm_home+ "/" + LLVM_BIN_selfbuild + "/bin/clang++ ")
print_debug("Now we have compiler for selfbuild: " + selfbuild_compiler + "\n", from_validation, alloy_build) print_debug("Now we have compiler for selfbuild: " + selfbuild_compiler + "\n", from_validation, alloy_build)
os.chdir(LLVM_BUILD) os.chdir(LLVM_BUILD)
if debug == False: if debug == False:
if current_OS != "Windows": if current_OS != "Windows":
if version_LLVM == "trunk":
try_do_LLVM("configure release version ",
"cmake -G Unix\ Makefiles" + " -DCMAKE_EXPORT_COMPILE_COMMANDS=ON" +
selfbuild_compiler +
" -DCMAKE_INSTALL_PREFIX=" + llvm_home + "/" + LLVM_BIN +
" -DCMAKE_BUILD_TYPE:STRING=Release" + " ../" + LLVM_SRC,
from_validation)
else:
try_do_LLVM("configure release version ", try_do_LLVM("configure release version ",
selfbuild_compiler + "../" + LLVM_SRC + "/configure --prefix=" + llvm_home + "/" + selfbuild_compiler + "../" + LLVM_SRC + "/configure --prefix=" + llvm_home + "/" +
LLVM_BIN + " --enable-optimized" + LLVM_BIN + " --enable-optimized" +
@@ -278,6 +299,14 @@ def build_LLVM(version_LLVM, revision, folder, tarball, debug, selfbuild, extra,
'cmake -G "Visual Studio 12" -DCMAKE_INSTALL_PREFIX="..\\'+ LLVM_BIN + 'cmake -G "Visual Studio 12" -DCMAKE_INSTALL_PREFIX="..\\'+ LLVM_BIN +
'" -DLLVM_LIT_TOOLS_DIR="C:\\gnuwin32\\bin" ..\\' + LLVM_SRC, '" -DLLVM_LIT_TOOLS_DIR="C:\\gnuwin32\\bin" ..\\' + LLVM_SRC,
from_validation) from_validation)
else:
if version_LLVM == "trunk":
try_do_LLVM("configure debug version ",
"cmake -G Unix\ Makefiles" + " -DCMAKE_EXPORT_COMPILE_COMMANDS=ON" +
selfbuild_compiler +
" -DCMAKE_INSTALL_PREFIX=" + llvm_home + "/" + LLVM_BIN +
" -DCMAKE_BUILD_TYPE:STRING=Debug" + " ../" + LLVM_SRC,
from_validation)
else: else:
try_do_LLVM("configure debug version ", try_do_LLVM("configure debug version ",
selfbuild_compiler + "../" + LLVM_SRC + "/configure --prefix=" + llvm_home + "/" + LLVM_BIN + selfbuild_compiler + "../" + LLVM_SRC + "/configure --prefix=" + llvm_home + "/" + LLVM_BIN +