Merge pull request swiftlang#2856 from drexin/wip-fix-uuid-install

Install libuuid in non-arch specific folder until layout is fixed

Author: millenomi

Sources/UUID/CMakeLists.txt

@@ -23,9 +23,12 @@ set_target_properties(uuid PROPERTIES
 if(NOT BUILD_SHARED_LIBS)
   set_property(GLOBAL APPEND PROPERTY Foundation_EXPORTS uuid)
 
-  get_swift_host_arch(swift_arch)
+  # get_swift_host_arch(swift_arch)
+
+  # TODO(drexin): should be installed in architecture specific folder, once
+  # the layout is fixed for non-Darwin platforms
   install(TARGETS uuid
-    ARCHIVE DESTINATION lib/swift_static/$<LOWER_CASE:${CMAKE_SYSTEM_NAME}>/${swift_arch}
-    LIBRARY DESTINATION lib/swift_static/$<LOWER_CASE:${CMAKE_SYSTEM_NAME}>/${swift_arch}
+    ARCHIVE DESTINATION lib/swift_static/$<LOWER_CASE:${CMAKE_SYSTEM_NAME}>
+    LIBRARY DESTINATION lib/swift_static/$<LOWER_CASE:${CMAKE_SYSTEM_NAME}>
     RUNTIME DESTINATION bin)
 endif()