diff --git a/Makefile b/Makefile
index 1e2d48e5e73b8ad6a3774a2bd20ef020daf188f4..3f29f73ee6b45122de33c8edb3a8426d51660022 100644
--- a/Makefile
+++ b/Makefile
@@ -349,7 +349,7 @@ endif
 
 $(SHARED4):
 	$(CXX) $(PLATFORM_SHARED_LDFLAGS)$(SHARED3) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $(LIB_SOURCES) \
-		-Wl,--no-as-needed $(LDFLAGS) -o $@
+		$(LDFLAGS) -o $@
 
 endif  # PLATFORM_SHARED_EXT
 
diff --git a/build_tools/build_detect_platform b/build_tools/build_detect_platform
index 35ca03d369d1130e235b975bf192617a2cb67af1..d0769e33829d44d3c827d82109742fa3b23f785f 100755
--- a/build_tools/build_detect_platform
+++ b/build_tools/build_detect_platform
@@ -92,7 +92,7 @@ CROSS_COMPILE=
 PLATFORM_CCFLAGS=
 PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS"
 PLATFORM_SHARED_EXT="so"
-PLATFORM_SHARED_LDFLAGS="-shared -Wl,-soname -Wl,"
+PLATFORM_SHARED_LDFLAGS="-Wl,--no-as-needed -shared -Wl,-soname -Wl,"
 PLATFORM_SHARED_CFLAGS="-fPIC"
 PLATFORM_SHARED_VERSIONED=true