Revert several commits working around the autolinking breakage.

jrose-apple · jrose-apple · commit bdc42e71d984 · 2015-11-13T20:21:04.000-08:00
Swift was failing to autolink frameworks in the new text-based SDKs. Clang r253060 fixes the underlying issue, so we can go back to relying on autolinking for these. This reverts the following commits (newest to oldest): f658841 59092a3 7ea9d54 e52ef22 rdar://problem/23511008
diff --git a/stdlib/public/SDK/UIKit/CMakeLists.txt b/stdlib/public/SDK/UIKit/CMakeLists.txt
@@ -2,9 +2,9 @@ add_swift_library(swiftUIKit IS_SDK_OVERLAY
   DesignatedInitializers.mm
   UIKit.swift
   TARGET_SDKS IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR
-  SWIFT_MODULE_DEPENDS ObjectiveC Foundation CoreGraphics
-  SWIFT_MODULE_DEPENDS_IOS Contacts CoreImage CoreGraphics
-  SWIFT_MODULE_DEPENDS_TVOS CoreImage CoreGraphics
+  SWIFT_MODULE_DEPENDS ObjectiveC Foundation
+  SWIFT_MODULE_DEPENDS_IOS Contacts CoreImage
+  SWIFT_MODULE_DEPENDS_TVOS CoreImage
   SWIFT_COMPILE_FLAGS_WATCHOS -Xfrontend -disable-autolink-framework -Xfrontend CoreText
   FRAMEWORK_DEPENDS UIKit)
 
diff --git a/test/lit.cfg b/test/lit.cfg
@@ -557,15 +557,12 @@ if run_vendor == 'apple':
             (run_cpu, run_os, run_vers, clang_mcp_opt))
 
         config.target_cc_options = target_cc_options
-        extra_frameworks = ['AppKit', 'CoreGraphics', 'SceneKit', 'CoreLocation',
-                            'Accelerate', 'CoreImage', 'QuartzCore', 'CoreMedia',
-                            'OpenCL']
         config.target_build_swift = (
-            "%s %s %s -F %s -Xlinker -rpath -Xlinker %s %s %s %s %s"
+            "%s %s %s -F %s -Xlinker -rpath -Xlinker %s %s %s %s"
             % (xcrun_prefix, config.swiftc, target_options,
                extra_frameworks_dir, extra_frameworks_dir,
                sdk_overlay_linker_opt, config.swift_test_options,
-               swift_execution_tests_extra_flags, " -framework " + " -framework ".join(extra_frameworks)))
+               swift_execution_tests_extra_flags))
         config.target_swift_frontend = (
             "%s -frontend %s -sdk %s %s" %
             (config.swiftc, target_options, config.variant_sdk,
diff --git a/validation-test/stdlib/GameplayKit.swift b/validation-test/stdlib/GameplayKit.swift
@@ -3,7 +3,6 @@
 
 // REQUIRES: objc_interop
 // UNSUPPORTED: OS=watchos
-// REQUIRES: rdar23527707
 
 import StdlibUnittest
 import GameplayKit
diff --git a/validation-test/stdlib/OpenCLSDKOverlay.swift b/validation-test/stdlib/OpenCLSDKOverlay.swift
@@ -1,7 +1,6 @@
 // RUN: %target-run-simple-swift
 // REQUIRES: executable_test
 // REQUIRES: OS=macosx
-// REQUIRES: rdar23505191
 
 // Translated from standard OpenCL hello.c program
 
