averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into master-llvm-swift5-transition

Browse Source
This commit is contained in:
swift-ci
2018-03-01 15:59:52 -08:00
parent 416432a193 66bb9ce4ba
commit 1386c0e9bc
15 changed files with 407 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/modules/SwiftHandleGybSources.cmake
View File

@@ -37,10 +37,6 @@ function(handle_gyb_source_single dependency_out_var_name)
GYB_SINGLE # prefix
"${options}" "${single_value_args}" "${multi_value_args}" ${ARGN})
set(gyb_flags
${SWIFT_GYB_FLAGS}
${GYB_SINGLE_FLAGS})
set(gyb_tool "${SWIFT_SOURCE_DIR}/utils/gyb")
set(gyb_tool_source "${gyb_tool}" "${gyb_tool}.py")
@@ -62,11 +58,9 @@ function(handle_gyb_source_single dependency_out_var_name)
COMMAND
"${CMAKE_COMMAND}" -E make_directory "${dir}"
COMMAND
"${PYTHON_EXECUTABLE}" "${gyb_tool}" "${gyb_flags}"
-o "${GYB_SINGLE_OUTPUT}.tmp" "${GYB_SINGLE_SOURCE}"
"${PYTHON_EXECUTABLE}" "${gyb_tool}" ${SWIFT_GYB_FLAGS} ${GYB_SINGLE_FLAGS} -o "${GYB_SINGLE_OUTPUT}.tmp" "${GYB_SINGLE_SOURCE}"
COMMAND
"${CMAKE_COMMAND}" -E copy_if_different
"${GYB_SINGLE_OUTPUT}.tmp" "${GYB_SINGLE_OUTPUT}"
"${CMAKE_COMMAND}" -E copy_if_different "${GYB_SINGLE_OUTPUT}.tmp" "${GYB_SINGLE_OUTPUT}"
COMMAND
"${CMAKE_COMMAND}" -E remove "${GYB_SINGLE_OUTPUT}.tmp"
OUTPUT "${GYB_SINGLE_OUTPUT}"