Extract extension and compile only for non-freestanding

Author: kastiglione

stdlib/public/core/CMakeLists.txt

@@ -260,6 +260,10 @@ if(SWIFT_STDLIB_ENABLE_VECTOR_TYPES)
   list(APPEND SWIFTLIB_EMBEDDED_GYB_SOURCES SIMDConcreteOperations.swift.gyb SIMDVectorTypes.swift.gyb)
 endif()
 
+if(NOT SWIFT_FREESTANDING_FLAVOR)
+  list(APPEND SWIFTLIB_SOURCES ObjectIdentifier+DebugDescription.swift)
+endif()
+
 list(APPEND SWIFTLIB_EMBEDDED_SOURCES
   EmbeddedRuntime.swift
   EmbeddedStubs.swift

stdlib/public/core/ObjectIdentifier+DebugDescription.swift

@@ -0,0 +1,20 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+#if !$Embedded
+@_DebugDescription
+extension ObjectIdentifier {
+  var _debugDescription: String {
+    return "ObjectIdentifier(\(_value))"
+  }
+}
+#endif

stdlib/public/core/ObjectIdentifier.swift

@@ -94,15 +94,6 @@ extension ObjectIdentifier: CustomDebugStringConvertible {
   }
 }
 
-#if !$Embedded
-@_DebugDescription
-extension ObjectIdentifier {
-  var _debugDescription: String {
-    return "ObjectIdentifier(\(_value))"
-  }
-}
-#endif
-
 extension ObjectIdentifier: Equatable {
   @inlinable // trivial-implementation
   public static func == (x: ObjectIdentifier, y: ObjectIdentifier) -> Bool {

utils/swift_build_support/swift_build_support/products/minimalstdlib.py

@@ -93,7 +93,7 @@ def build(self, host_target):
             'SWIFT_BUILD_STATIC_SDK_OVERLAY:BOOL', 'FALSE')
         self.cmake_options.define('SWIFT_BUILD_STATIC_STDLIB:BOOL', 'TRUE')
         self.cmake_options.define('SWIFT_INCLUDE_TESTS:BOOL', 'TRUE')
-        self.cmake_options.define('SWIFT_INCLUDE_TOOLS:BOOL', 'TRUE')
+        self.cmake_options.define('SWIFT_INCLUDE_TOOLS:BOOL', 'FALSE')
 
         # Stdlib feature flags
         self.cmake_options.define('SWIFT_ENABLE_BACKTRACING:BOOL', 'FALSE')