From 3a14f00f343aed7b859104b3aa28a62c201d18b2 Mon Sep 17 00:00:00 2001
From: Dario Rexin <drexin@apple.com>
Date: Mon, 24 Aug 2020 10:41:49 -0700
Subject: [PATCH] Install libuuid in non-arch specific folder until layout is
 fixed

---
 Sources/UUID/CMakeLists.txt | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Sources/UUID/CMakeLists.txt b/Sources/UUID/CMakeLists.txt
index 8ddf42613b..bdbe1beafe 100644
--- a/Sources/UUID/CMakeLists.txt
+++ b/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()