From: Chris Bieneman <chris.bieneman@me.com>
Date: Tue, 21 May 2019 15:56:17 +0000 (+0000)
Subject: Fix BUILD_SHARED_LIBS for clang which broke in D61909
X-Git-Tag: llvmorg-9.0.0-rc1~5057
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dbc2a12c7311ff4cc2cd7887d128b506bd35b579;p=platform%2Fupstream%2Fllvm.git

Fix BUILD_SHARED_LIBS for clang which broke in D61909

llvm_add_library ignores `BUILD_SHARED_LIBS` `STATIC` is explicitly specified. This restores the `BUILD_SHARED_LIBS` behavior to the clang build.

llvm-svn: 361271
---

diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake
index b598f13ff6ff..0c9cd6676033 100644
--- a/clang/cmake/modules/AddClang.cmake
+++ b/clang/cmake/modules/AddClang.cmake
@@ -83,7 +83,13 @@ macro(add_clang_library name)
   if(ARG_SHARED)
     set(LIBTYPE SHARED)
   else()
-    set(LIBTYPE STATIC OBJECT)
+    # llvm_add_library ignores BUILD_SHARED_LIBS if STATIC is explicitly set,
+    # so we need to handle it here.
+    if(BUILD_SHARED_LIBS)
+      set(LIBTYPE SHARED OBJECT)
+    else()
+      set(LIBTYPE STATIC OBJECT)
+    endif()
     set_property(GLOBAL APPEND PROPERTY CLANG_STATIC_LIBS ${name})
   endif()
   llvm_add_library(${name} ${LIBTYPE} ${ARG_UNPARSED_ARGUMENTS} ${srcs})