diff --git a/adm/cmake/occt_defs_flags.cmake b/adm/cmake/occt_defs_flags.cmake

index ec31fdd80..26411ba6a 100644

--- a/adm/cmake/occt_defs_flags.cmake

+++ b/adm/cmake/occt_defs_flags.cmake

@@ -173,8 +173,6 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "[Cc][Ll][Aa][Nn][Gg]")

     # CLang can be used with both libstdc++ and libc++, however on OS X libstdc++ is outdated.

     set (CMAKE_CXX_FLAGS "-stdlib=libc++ ${CMAKE_CXX_FLAGS}")

   endif()

-  # Optimize size of binaries

-  set (CMAKE_SHARED_LINKER_FLAGS_RELEASE "-Wl,-s ${CMAKE_SHARED_LINKER_FLAGS_RELEASE}")

 endif()

 if(MINGW)

   add_definitions(-D_WIN32_WINNT=0x0601)

@@ -183,11 +181,6 @@ if(MINGW)

   # workaround bugs in mingw with vtable export

   set (CMAKE_SHARED_LINKER_FLAGS "-Wl,--export-all-symbols")

 endif()

-if (DEFINED CMAKE_COMPILER_IS_GNUCXX)

-  # Optimize size of binaries

-  set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")

-  set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")

-endif()

 if (BUILD_RELEASE_DISABLE_EXCEPTIONS)

   set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception")

diff --git a/adm/cmake/jemalloc.cmake b/adm/cmake/jemalloc.cmake

index 579ed3e15..08917d94c 100644

--- a/adm/cmake/jemalloc.cmake

+++ b/adm/cmake/jemalloc.cmake

@@ -67,6 +67,7 @@ macro (JEMALLOC_LIB_SEARCH MMGR_LIB PREFIX)

 endmacro()

 macro (SEARCH_JEMALLOC)

+if(BUILD_LIBRARY_TYPE EQUAL "Static")

   # find static jemalloc lib

   SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".a")

   if (WIN32)

@@ -76,10 +77,13 @@ macro (SEARCH_JEMALLOC)

     SET(CMAKE_FIND_LIBRARY_SUFFIXES "" "so")

     JEMALLOC_LIB_SEARCH ("jemalloc.so.2" "SHARED")

   endif()

+endif()

+if(BUILD_LIBRARY_TYPE EQUAL "Shared")

   # find shared jemalloc lib

   SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dll" ".so")

   JEMALLOC_LIB_SEARCH ("jemalloc" "SHARED")

+endif()

 endmacro()

 # Reset CSF variable

	"${FILESDIR}/${PN}-7.8.2-avoid-pre-stripping-binaries.patch"

	"${FILESDIR}/${PN}-7.8.2-jemalloc-lib-type.patch"