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

temp fix for new llvm cmake build system, without gcc-toolchain & some keys

Browse Source
This commit is contained in:
Andrey Shishpanov
2016-01-29 15:32:51 +03:00
parent ccd8592e46
commit 4e3d8540ff
1 changed files with 50 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
alloy.py
View File

@@ -247,45 +247,74 @@ 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)
try_do_LLVM("configure release version for selfbuild ", if version_LLVM == "trunk":
"../" + LLVM_SRC + "/configure --prefix=" + llvm_home + "/" + try_do_LLVM("configure release version for selfbuild ",
LLVM_BIN_selfbuild + " --enable-optimized" + "cmake -G Unix\ Makefiles" + " -DCMAKE_EXPORT_COMPILE_COMMANDS=ON" +
" --enable-targets=x86,x86_64,nvptx" + selfbuild_compiler +
((" --with-gcc-toolchain=" + gcc_toolchain_path) if gcc_toolchain_path != "" else "") + " -DCMAKE_INSTALL_PREFIX=" + llvm_home + "/" + LLVM_BIN_selfbuild +
mac_system_root, " -DCMAKE_BUILD_TYPE:STRING=Release" + " ../" + LLVM_SRC,
from_validation) from_validation)
else:
try_do_LLVM("configure release version for selfbuild ",
"../" + LLVM_SRC + "/configure --prefix=" + llvm_home + "/" +
LLVM_BIN_selfbuild + " --enable-optimized" +
" --enable-targets=x86,x86_64,nvptx" +
((" --with-gcc-toolchain=" + gcc_toolchain_path) if gcc_toolchain_path != "" else "") +
mac_system_root,
from_validation)
try_do_LLVM("build release version for selfbuild ", try_do_LLVM("build release version for selfbuild ",
make, from_validation) make, from_validation)
try_do_LLVM("install release version for selfbuild ", try_do_LLVM("install release version for selfbuild ",
"make install", "make install",
from_validation) from_validation)
os.chdir("../") os.chdir("../")
selfbuild_compiler = ("CC=" +llvm_home+ "/" + LLVM_BIN_selfbuild + "/bin/clang " + if version_LLVM == "trunk":
"CXX="+llvm_home+ "/" + LLVM_BIN_selfbuild + "/bin/clang++ ") 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 " +
"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":
try_do_LLVM("configure release version ", if version_LLVM == "trunk":
selfbuild_compiler + "../" + LLVM_SRC + "/configure --prefix=" + llvm_home + "/" + try_do_LLVM("configure release version ",
LLVM_BIN + " --enable-optimized" + "cmake -G Unix\ Makefiles" + " -DCMAKE_EXPORT_COMPILE_COMMANDS=ON" +
" --enable-targets=x86,x86_64,nvptx" + selfbuild_compiler +
((" --with-gcc-toolchain=" + gcc_toolchain_path) if gcc_toolchain_path != "" else "") + " -DCMAKE_INSTALL_PREFIX=" + llvm_home + "/" + LLVM_BIN +
mac_system_root, " -DCMAKE_BUILD_TYPE:STRING=Release" + " ../" + LLVM_SRC,
from_validation) from_validation)
else:
try_do_LLVM("configure release version ",
selfbuild_compiler + "../" + LLVM_SRC + "/configure --prefix=" + llvm_home + "/" +
LLVM_BIN + " --enable-optimized" +
" --enable-targets=x86,x86_64,nvptx" +
((" --with-gcc-toolchain=" + gcc_toolchain_path) if gcc_toolchain_path != "" else "") +
mac_system_root,
from_validation)
else: else:
try_do_LLVM("configure release version ", try_do_LLVM("configure release version ",
'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: else:
try_do_LLVM("configure debug version ", if version_LLVM == "trunk":
selfbuild_compiler + "../" + LLVM_SRC + "/configure --prefix=" + llvm_home + "/" + LLVM_BIN + try_do_LLVM("configure debug version ",
" --enable-debug-runtime --enable-debug-symbols --enable-keep-symbols" + "cmake -G Unix\ Makefiles" + " -DCMAKE_EXPORT_COMPILE_COMMANDS=ON" +
" --enable-targets=x86,x86_64,nvptx" + selfbuild_compiler +
((" --with-gcc-toolchain=" + gcc_toolchain_path) if gcc_toolchain_path != "" else "") + " -DCMAKE_INSTALL_PREFIX=" + llvm_home + "/" + LLVM_BIN +
mac_system_root, " -DCMAKE_BUILD_TYPE:STRING=Debug" + " ../" + LLVM_SRC,
from_validation) from_validation)
else:
try_do_LLVM("configure debug version ",
selfbuild_compiler + "../" + LLVM_SRC + "/configure --prefix=" + llvm_home + "/" + LLVM_BIN +
" --enable-debug-runtime --enable-debug-symbols --enable-keep-symbols" +
" --enable-targets=x86,x86_64,nvptx" +
((" --with-gcc-toolchain=" + gcc_toolchain_path) if gcc_toolchain_path != "" else "") +
mac_system_root,
from_validation)
# building llvm # building llvm
if current_OS != "Windows": if current_OS != "Windows":
try_do_LLVM("build LLVM ", make, from_validation) try_do_LLVM("build LLVM ", make, from_validation)