diff --git a/CMakeLists.txt b/CMakeLists.txt
index fce32e50..b44091d5 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ project(openlibm
         VERSION 0.8.0
         LANGUAGES C ASM)
 
-add_library("${PROJECT_NAME}" STATIC)
+add_library("${PROJECT_NAME}" SHARED)
 
 
 # Find the relevant folder depending on the architecture
@@ -361,39 +361,38 @@ if (LONG_DOUBLE_NOT_DOUBLE)
                 "${PROJECT_SRC}/ld80/s_nanl.c"
             )
         endif()
-    endif()
-
-else()
-    if(${OPENLIBM_ARCH_FOLDER} STREQUAL "aarch64")
-        list(APPEND OPENLIBM_C_SOURCE
-            # ld128
-            "${PROJECT_SRC}/ld128/invtrig.c"
-            "${PROJECT_SRC}/ld128/e_acoshl.c"
-            "${PROJECT_SRC}/ld128/e_powl.c"
-            "${PROJECT_SRC}/ld128/k_tanl.c"
-            "${PROJECT_SRC}/ld128/s_exp2l.c"
-            "${PROJECT_SRC}/ld128/e_atanhl.c"
-            "${PROJECT_SRC}/ld128/e_lgammal_r.c"
-            "${PROJECT_SRC}/ld128/e_sinhl.c"
-            "${PROJECT_SRC}/ld128/s_asinhl.c"
-            "${PROJECT_SRC}/ld128/s_expm1l.c"
-            "${PROJECT_SRC}/ld128/e_coshl.c"
-            "${PROJECT_SRC}/ld128/e_log10l.c"
-            "${PROJECT_SRC}/ld128/e_tgammal.c"
-            "${PROJECT_SRC}/ld128/e_expl.c"
-            "${PROJECT_SRC}/ld128/e_log2l.c"
-            "${PROJECT_SRC}/ld128/k_cosl.c"
-            "${PROJECT_SRC}/ld128/s_log1pl.c"
-            "${PROJECT_SRC}/ld128/s_tanhl.c"
-            "${PROJECT_SRC}/ld128/e_logl.c"
-            "${PROJECT_SRC}/ld128/k_sinl.c"
-            "${PROJECT_SRC}/ld128/s_erfl.c"
-        )
-
-        if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+    else()
+        if(${OPENLIBM_ARCH_FOLDER} STREQUAL "aarch64")
             list(APPEND OPENLIBM_C_SOURCE
-                "${PROJECT_SRC}/ld128/s_nanl.c"
+                # ld128
+                "${PROJECT_SRC}/ld128/invtrig.c"
+                "${PROJECT_SRC}/ld128/e_acoshl.c"
+                "${PROJECT_SRC}/ld128/e_powl.c"
+                "${PROJECT_SRC}/ld128/k_tanl.c"
+                "${PROJECT_SRC}/ld128/s_exp2l.c"
+                "${PROJECT_SRC}/ld128/e_atanhl.c"
+                "${PROJECT_SRC}/ld128/e_lgammal_r.c"
+                "${PROJECT_SRC}/ld128/e_sinhl.c"
+                "${PROJECT_SRC}/ld128/s_asinhl.c"
+                "${PROJECT_SRC}/ld128/s_expm1l.c"
+                "${PROJECT_SRC}/ld128/e_coshl.c"
+                "${PROJECT_SRC}/ld128/e_log10l.c"
+                "${PROJECT_SRC}/ld128/e_tgammal.c"
+                "${PROJECT_SRC}/ld128/e_expl.c"
+                "${PROJECT_SRC}/ld128/e_log2l.c"
+                "${PROJECT_SRC}/ld128/k_cosl.c"
+                "${PROJECT_SRC}/ld128/s_log1pl.c"
+                "${PROJECT_SRC}/ld128/s_tanhl.c"
+                "${PROJECT_SRC}/ld128/e_logl.c"
+                "${PROJECT_SRC}/ld128/k_sinl.c"
+                "${PROJECT_SRC}/ld128/s_erfl.c"
             )
+
+            if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+                list(APPEND OPENLIBM_C_SOURCE
+                    "${PROJECT_SRC}/ld128/s_nanl.c"
+                )
+            endif()
         endif()
     endif()
 endif()
@@ -505,28 +504,24 @@ endif()
 
 
 # Filter out C implementation from compilation list if a native implementation exists
-# when generating a shared library to avoid multiple definitions
-get_target_property(TARGET_TYPE "${PROJECT_NAME}" TYPE)
-if (TARGET_TYPE STREQUAL SHARED_LIBRARY)
-    foreach(FILE_TO_REMOVE ${OPENLIBM_ASM_SOURCE})
-        # Get filename and strip out extension
-        cmake_path(GET FILE_TO_REMOVE FILENAME FILENAME_TO_REMOVE)
-        cmake_path(REMOVE_EXTENSION FILENAME_TO_REMOVE OUTPUT_VARIABLE FILENAME_TO_REMOVE)
-        message(DEBUG "Filename to remove: ${FILENAME_TO_REMOVE}")
-
-        # Go through files and remove one with the same name
-        foreach(CUR_FILE ${OPENLIBM_C_SOURCE})
-            cmake_path(GET CUR_FILE FILENAME CUR_FILENAME)
-            cmake_path(REMOVE_EXTENSION CUR_FILENAME OUTPUT_VARIABLE CUR_FILENAME)
-
-            if(${CUR_FILENAME} STREQUAL ${FILENAME_TO_REMOVE})
-                list(REMOVE_ITEM OPENLIBM_C_SOURCE ${CUR_FILE})
-                message(DEBUG "Removed source file from compilation list: ${CUR_FILE}")
-                break()
-            endif()
-        endforeach()
+foreach(FILE_TO_REMOVE ${OPENLIBM_ASM_SOURCE})
+    # Get filename and strip out extension
+    cmake_path(GET FILE_TO_REMOVE FILENAME FILENAME_TO_REMOVE)
+    cmake_path(REMOVE_EXTENSION FILENAME_TO_REMOVE OUTPUT_VARIABLE FILENAME_TO_REMOVE)
+    message(DEBUG "Filename to remove: ${FILENAME_TO_REMOVE}")
+
+    # Go through files and remove one with the same name
+    foreach(CUR_FILE ${OPENLIBM_C_SOURCE})
+        cmake_path(GET CUR_FILE FILENAME CUR_FILENAME)
+        cmake_path(REMOVE_EXTENSION CUR_FILENAME OUTPUT_VARIABLE CUR_FILENAME)
+
+        if(${CUR_FILENAME} STREQUAL ${FILENAME_TO_REMOVE})
+            list(REMOVE_ITEM OPENLIBM_C_SOURCE ${CUR_FILE})
+            message(DEBUG "Removed source file from compilation list: ${CUR_FILE}")
+            break()
+        endif()
     endforeach()
-endif()
+endforeach()
 
 
 # Add sources
diff --git a/README.md b/README.md
index 7fc2f413..c363e297 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ consistently across compilers and operating systems, and in 32-bit and
 OpenLibm builds on Linux, macOS, Windows, FreeBSD, OpenBSD, NetBSD, and
 DragonFly BSD.  It builds with both GCC and clang. Although largely
 tested and widely used on the x86 and x86-64 architectures, OpenLibm
-also supports arm, aarch64, ppc64le, mips, wasm32, riscv, s390(x) and 
+also supports arm, aarch64, ppc64le, mips, wasm32, riscv, s390(x) and
 loongarch64.
 
 ## Build instructions
@@ -43,8 +43,8 @@ loongarch64.
 or generate project with build system of choice e.g. `cmake /path/to/openlib/ -G "MinGW Makefiles"`.
 3. Build with the build system with `cmake --build .`.
 
-Default CMake configuration builds a `STATIC` library. To build a `SHARED` library,
-replace the keyword the `add_library()`in the `CMakeLists.txt`.
+Default CMake configuration builds a shared library, this can easily be changed by replacing
+the keyword in the `add_library()` command in the `CMakeLists.txt`.
 
 
 ## Acknowledgements