Cleanup CMakeConfig.h.in generation across the codebase

Addresses rdar://154230645

Author: edymtt

Runtimes/Core/runtime/CMakeConfig.h.in

@@ -4,9 +4,6 @@
 #ifndef SWIFT_RUNTIME_CMAKECONFIG_H
 #define SWIFT_RUNTIME_CMAKECONFIG_H
 
-#cmakedefine01 SWIFT_BNI_OS_BUILD
-#cmakedefine01 SWIFT_BNI_XCODE_BUILD
-
 #define SWIFT_VERSION_MAJOR "@SwiftCore_VERSION_MAJOR@"
 #define SWIFT_VERSION_MINOR "@SwiftCore_VERSION_MINOR@"
 

Runtimes/Core/runtime/CMakeLists.txt

@@ -1,15 +1,3 @@
-# TODO: clean this up so it's less Apple-specific.
-# Detect B&I builds.
-set(SWIFT_BNI_OS_BUILD FALSE)
-set(SWIFT_BNI_XCODE_BUILD FALSE)
-if(DEFINED ENV{RC_XBS})
-  if((NOT DEFINED ENV{RC_XCODE} OR NOT "$ENV{RC_XCODE}") AND (NOT DEFINED ENV{RC_PLAYGROUNDS} OR NOT "$ENV{RC_PLAYGROUNDS}"))
-    set(SWIFT_BNI_OS_BUILD TRUE)
-  else()
-    set(SWIFT_BNI_XCODE_BUILD TRUE)
-  endif()
-endif()
-
 configure_file("CMakeConfig.h.in"
   "${PROJECT_BINARY_DIR}/include/swift/Runtime/CMakeConfig.h"
   ESCAPE_QUOTES @ONLY)

include/swift/Runtime/CMakeConfig.h.in

@@ -4,9 +4,6 @@
 #ifndef SWIFT_RUNTIME_CMAKECONFIG_H
 #define SWIFT_RUNTIME_CMAKECONFIG_H
 
-#cmakedefine01 SWIFT_BNI_OS_BUILD
-#cmakedefine01 SWIFT_BNI_XCODE_BUILD
-
 #define SWIFT_VERSION_MAJOR "@SWIFT_VERSION_MAJOR@"
 #define SWIFT_VERSION_MINOR "@SWIFT_VERSION_MINOR@"
 

include/swift/Runtime/CMakeLists.txt

@@ -1,14 +1,3 @@
-# Detect B&I builds.
-set(SWIFT_BNI_OS_BUILD FALSE)
-set(SWIFT_BNI_XCODE_BUILD FALSE)
-if(DEFINED ENV{RC_XBS})
-  if((NOT DEFINED ENV{RC_XCODE} OR NOT "$ENV{RC_XCODE}") AND (NOT DEFINED ENV{RC_PLAYGROUNDS} OR NOT "$ENV{RC_PLAYGROUNDS}"))
-    set(SWIFT_BNI_OS_BUILD TRUE)
-  else()
-    set(SWIFT_BNI_XCODE_BUILD TRUE)
-  endif()
-endif()
-
 configure_file(CMakeConfig.h.in ${CMAKE_CURRENT_BINARY_DIR}/CMakeConfig.h
                ESCAPE_QUOTES @ONLY)
 swift_install_in_component(FILES ${CMAKE_CURRENT_BINARY_DIR}/CMakeConfig.h