Skip to content

Commit 2a3e6d5

Browse files
committed
Moving compiler-src-dir refs
Moving the rest of the references to the compiler source directory to use the `SwiftCore_SWIFTC_SOURCE_DIR` variable instead of `${PROJECT_SOURCE_DIR}/../../`.
1 parent db233bc commit 2a3e6d5

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

Runtimes/Core/Threading/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# and linking empty objects.
44
# https://github.com/swiftlang/swift/issues/77435
55
add_library(swiftThreading OBJECT
6-
"${PROJECT_SOURCE_DIR}/../../lib/Threading/C11.cpp"
7-
"${PROJECT_SOURCE_DIR}/../../lib/Threading/Linux.cpp"
8-
"${PROJECT_SOURCE_DIR}/../../lib/Threading/Pthreads.cpp"
9-
"${PROJECT_SOURCE_DIR}/../../lib/Threading/Win32.cpp")
6+
"${SwiftCore_SWIFTC_SOURCE_DIR}/lib/Threading/C11.cpp"
7+
"${SwiftCore_SWIFTC_SOURCE_DIR}/lib/Threading/Linux.cpp"
8+
"${SwiftCore_SWIFTC_SOURCE_DIR}/lib/Threading/Pthreads.cpp"
9+
"${SwiftCore_SWIFTC_SOURCE_DIR}/lib/Threading/Win32.cpp")
1010
target_link_libraries(swiftThreading PRIVATE swiftShims)

Runtimes/Core/cmake/modules/AvailabilityMacros.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
file(STRINGS "${PROJECT_SOURCE_DIR}/../../utils/availability-macros.def" availability_defs)
1+
file(STRINGS "${SwiftCore_SWIFTC_SOURCE_DIR}/utils/availability-macros.def" availability_defs)
22
list(FILTER availability_defs EXCLUDE REGEX "^\\s*(#.*)?$")
33
foreach(def ${availability_defs})
44
add_compile_options("$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -define-availability -Xfrontend \"${def}\">")

Runtimes/Core/cmake/modules/gyb.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function(gyb_expand source output)
2323
endforeach()
2424
list(REMOVE_DUPLICATES gyb_expand_deps)
2525

26-
set(utils_dir "${PROJECT_SOURCE_DIR}/../../utils/")
26+
set(utils_dir "${SwiftCore_SWIFTC_SOURCE_DIR}/utils/")
2727
set(gyb_tool "${utils_dir}/gyb")
2828

2929
# All the tidbits to track for changes

Runtimes/Core/stubs/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ target_include_directories(swiftStdlibStubs PRIVATE
4545
# swift/Runtime/Debug.h
4646
# ...
4747
#
48-
"${PROJECT_SOURCE_DIR}/../../include")
48+
"${SwiftCore_SWIFTC_SOURCE_DIR}/include")
4949

5050
if(APPLE)
5151
set_property(SOURCE SwiftNativeNSXXXBaseARC.m

0 commit comments

Comments
 (0)