RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-21 18:22:53 +01:00
Code Issues Projects Releases Wiki Activity

Revert a few unsuccessful attempts at fixing bots.

Browse Source 
I broke bots last week and tried a few things to fix them.
These were attempts that didn't help, so back them back out.

This reverts commit c7aff9a109b611e4954a3055061a8076b4baa385.
This reverts commit 8838d6d3566d940859fd26b20aed4cb57d490988.
This reverts commit e875ba1509955dc4b3512d820edecc0da26fa38d.
This commit is contained in:
Nico Weber 2020-04-13 16:53:06 -04:00
parent cbb2eefe0b
commit 3036d2b46b
4 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmake/modules/AddLLVM.cmake
View File

@ -1399,7 +1399,7 @@ endmacro()
function(make_paths_relative out_pathlist basedir pathlist)
# Passing ARG_PATH_VALUES as-is to execute_process() makes cmake strip
# empty list entries. So escape the ;s in the list and do the splitting
# outselves. cmake has no relpath function, so use Python for that.
# ourselves. cmake has no relpath function, so use Python for that.
string(REPLACE ";" "\\;" pathlist_escaped "${pathlist}")
execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c" "\n
import os, sys\n
@ -1411,7 +1411,7 @@ def relpath(p):\n
if not p: return ''\n
if os.path.splitdrive(p)[0] != os.path.splitdrive(base)[0]: return p\n
if haslink(p) or haslink(base): return p\n
return os.path.relpath(p, base).replace(os.sep, '/')\n
return os.path.relpath(p, base)\n
sys.stdout.write(';'.join(relpath(p) for p in sys.argv[2].split(';')))"
${basedir}
${pathlist_escaped}
@ -1430,11 +1430,10 @@ string(CONCAT LLVM_LIT_PATH_FUNCTION
# important that this restores the on-disk case of the prefix.
"# Allow generated file to be relocatable.\n"
"def path(p):\n"
" if not p: return ''\n"
" p = os.path.join(os.path.dirname(os.path.abspath(__file__)), p)\n"
" p = os.path.normpath(p).replace(os.sep, '/')\n"
" if os.name == 'nt' and os.path.isabs(p): return p[0].upper() + p[1:]\n"
" return p\n"
" if not p: return ''\n"
" p = os.path.join(os.path.dirname(os.path.abspath(__file__)), p)\n"
" if os.name == 'nt' and os.path.isabs(p): return p[0].upper() + p[1:]\n"
" return p\n"
)
# This function provides an automatic way to 'configure'-like generate a file

8
test/Unit/lit.site.cfg.py.in
View File

@ -2,12 +2,12 @@
import sys
config.llvm_src_root = path("@LLVM_SOURCE_DIR@")
config.llvm_obj_root = path("@LLVM_BINARY_DIR@")
config.llvm_tools_dir = path("@LLVM_TOOLS_DIR@")
config.llvm_src_root = path(r"@LLVM_SOURCE_DIR@")
config.llvm_obj_root = path(r"@LLVM_BINARY_DIR@")
config.llvm_tools_dir = path(r"@LLVM_TOOLS_DIR@")
config.llvm_build_mode = "@LLVM_BUILD_MODE@"
config.enable_shared = @ENABLE_SHARED@
config.shlibdir = path("@SHLIBDIR@")
config.shlibdir = path(r"@SHLIBDIR@")
# Support substitution of the tools_dir and build_mode with user parameters.
# This is used when we can't determine the tool dir at configuration time.

12
test/lit.site.cfg.py.in
View File

@ -4,14 +4,14 @@ import sys
config.host_triple = "@LLVM_HOST_TRIPLE@"
config.target_triple = "@TARGET_TRIPLE@"
config.llvm_src_root = path("@LLVM_SOURCE_DIR@")
config.llvm_obj_root = path("@LLVM_BINARY_DIR@")
config.llvm_tools_dir = path("@LLVM_TOOLS_DIR@")
config.llvm_lib_dir = path("@LLVM_LIBRARY_DIR@")
config.llvm_shlib_dir = path("@SHLIBDIR@")
config.llvm_src_root = path(r"@LLVM_SOURCE_DIR@")
config.llvm_obj_root = path(r"@LLVM_BINARY_DIR@")
config.llvm_tools_dir = path(r"@LLVM_TOOLS_DIR@")
config.llvm_lib_dir = path(r"@LLVM_LIBRARY_DIR@")
config.llvm_shlib_dir = path(r"@SHLIBDIR@")
config.llvm_shlib_ext = "@SHLIBEXT@"
config.llvm_exe_ext = "@EXEEXT@"
config.lit_tools_dir = path("@LLVM_LIT_TOOLS_DIR@")
config.lit_tools_dir = path(r"@LLVM_LIT_TOOLS_DIR@")
config.python_executable = "@PYTHON_EXECUTABLE@"
config.gold_executable = "@GOLD_EXECUTABLE@"
config.ld64_executable = "@LD64_EXECUTABLE@"

2
utils/llvm-lit/CMakeLists.txt
View File

@ -22,7 +22,7 @@ if (${file_last} GREATER -1)
list(GET LLVM_LIT_CONFIG_FILES ${i} main_config)
math(EXPR i1 "${i} + 1")
list(GET LLVM_LIT_CONFIG_FILES ${i1} site_out)
set(map "map_config(path('${main_config}'), path('${site_out}'))")
set(map "map_config(path(r'${main_config}'), path(r'${site_out}'))")
set(LLVM_LIT_CONFIG_MAP "${LLVM_LIT_CONFIG_MAP}\n${map}")
endforeach()
endif()