diff options
| author | Chris Bieneman <chris.bieneman@me.com> | 2019-05-21 15:56:17 +0000 |
|---|---|---|
| committer | Chris Bieneman <chris.bieneman@me.com> | 2019-05-21 15:56:17 +0000 |
| commit | dbc2a12c7311ff4cc2cd7887d128b506bd35b579 (patch) | |
| tree | efe7cfae6d597b92d17e71d9dc54b934e1766aad /clang/cmake/modules | |
| parent | 4b82e503153fd1ee7f2d624d1d654c92026c0e15 (diff) | |
| download | bcm5719-llvm-dbc2a12c7311ff4cc2cd7887d128b506bd35b579.tar.gz bcm5719-llvm-dbc2a12c7311ff4cc2cd7887d128b506bd35b579.zip | |
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
Diffstat (limited to 'clang/cmake/modules')
| -rw-r--r-- | clang/cmake/modules/AddClang.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake index b598f13ff6f..0c9cd667603 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}) |
