[btls] Remove last traces of statically linked btls
authorAlexander Köplinger <alex.koeplinger@outlook.com>
Fri, 20 Jan 2017 19:34:29 +0000 (20:34 +0100)
committerAlexander Köplinger <alex.koeplinger@outlook.com>
Fri, 20 Jan 2017 19:34:29 +0000 (20:34 +0100)
It was removed in d831fc4ec4c90930026342431641e529b2e34dc8.

mono/btls/CMakeLists.txt
mono/btls/Makefile.am

index 41ad49155e0d8442d2ca07c152436841d9d03e77..9f2365d3e50df411bb759a763f70a8b1f4cd038c 100644 (file)
@@ -22,13 +22,9 @@ if (NOT "${BTLS_ARCH}" STREQUAL "")
        message (WARNING "SET ARCH: ${BTLS_ARCH}")
        set (CMAKE_SYSTEM_PROCESSOR "${BTLS_ARCH}")
 endif ()
-if (BUILD_DYNAMIC_BTLS)
-set (C_CXX_FLAGS "-Wall -Wsign-compare -Wmissing-field-initializers -fPIC -ggdb -fvisibility=hidden")
-elseif (BUILD_SHARED_LIBS)
+
 set (C_CXX_FLAGS "-Wall -Wsign-compare -Wmissing-field-initializers -fPIC -ggdb -fvisibility=hidden")
-else ()
-set (C_CXX_FLAGS "-Wall -Wsign-compare -Wmissing-field-initializers -ggdb -fvisibility=hidden")
-endif()
+
 set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${C_CXX_FLAGS} ${BTLS_CFLAGS}")
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${C_CXX_FLAGS} ${BTLS_CFLAGS}")
 set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} ${BTLS_CFLAGS}")
@@ -84,8 +80,4 @@ set (
        ${BORINGSSL_OBJECTS}
 )
 
-if (BUILD_SHARED_LIBS)
-       add_library (mono-btls-shared SHARED ${MONO_BTLS_SOURCES})
-else ()
-       add_library (mono-btls-static STATIC ${MONO_BTLS_SOURCES})
-endif ()
+add_library (mono-btls-shared SHARED ${MONO_BTLS_SOURCES})
index 9006cb1e422e4cefaa3232f72e3a11f0b8fa0345..33bfb1f6f73e8934d5e0f8f294c3b74e001cc3b8 100644 (file)
@@ -43,7 +43,7 @@ CMAKE_VERBOSE=$(if $(V),VERBOSE=1,)
 CMAKE_ARGS = -D CMAKE_INSTALL_PREFIX:PATH=$(prefix) -D BTLS_ROOT:PATH=$(BTLS_ROOT) \
        -D SRC_DIR:PATH=$(abs_top_srcdir)/mono/btls -D BTLS_CFLAGS:STRING="$(BTLS_CFLAGS)"
 
-all-local: build-shared/libmono-btls-shared$(libsuffix) build-static/libmono-btls-static.a
+all-local: build-shared/libmono-btls-shared$(libsuffix)
 
 build-shared/Makefile:
        -mkdir -p build-shared
@@ -52,15 +52,7 @@ build-shared/Makefile:
 build-shared/libmono-btls-shared$(libsuffix): build-shared/Makefile $(MONO_BTLS_SOURCES_FILES)
        $(MAKE) -C build-shared $(CMAKE_VERBOSE)
 
-build-static/Makefile:
-       -mkdir -p build-static
-       (cd build-static && CC="$(CC)" CXX="$(CXX)" $(CMAKE) $(CMAKE_ARGS) $(BTLS_CMAKE_ARGS) $(abs_top_srcdir)/mono/btls)
-
-build-static/libmono-btls-static.a: build-static/Makefile
-       $(MAKE) -C build-static $(CMAKE_VERBOSE)
-
 clean-local:
-       -rm -rf build-static
        -rm -rf build-shared
 
 install-exec-local: