Skip to content

Commit 83c182d

Browse files
committed
---
yaml --- r: 347419 b: refs/heads/master c: 7380001 h: refs/heads/master i: 347417: 19348a9 347415: 14fc53c
1 parent 8d84255 commit 83c182d

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: e07b36bf6274472b06036ff1ac8f105294a76eb1
2+
refs/heads/master: 738000117196a60e7bd74da20293a5086c2edbe0
33
refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -477,12 +477,6 @@ if(NOT SWIFT_LIPO)
477477
find_toolchain_tool(SWIFT_LIPO "${SWIFT_DARWIN_XCRUN_TOOLCHAIN}" lipo)
478478
endif()
479479

480-
if("${SWIFT_NATIVE_LLVM_TOOLS_PATH}" STREQUAL "")
481-
set(SWIFT_CROSS_COMPILING FALSE)
482-
else()
483-
set(SWIFT_CROSS_COMPILING TRUE)
484-
endif()
485-
486480
# Reset CMAKE_SYSTEM_PROCESSOR if not cross-compiling.
487481
# CMake refuses to use `uname -m` on OS X
488482
# http://public.kitware.com/Bug/view.php?id=10326

0 commit comments

Comments
 (0)