diff --git a/Makefile.rules b/Makefile.rules
index 974a962102f..05b9689973b 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -319,9 +319,12 @@ ifeq ($(ENABLE_PROFILING),1)
   KEEP_SYMBOLS := 1
 endif
 
-#ifeq ($(ENABLE_VISIBILITY_INLINES_HIDDEN),1)
-#    CXX.Flags += -fvisibility-inlines-hidden
-#endif
+ifeq ($(ENABLE_VISIBILITY_INLINES_HIDDEN),1)
+# FIXME: clang's -fvisibility-inlines-hidden is broken for shared libs. PR11642.
+ifneq ($(ENABLE_SHARED),1)
+    CXX.Flags += -fvisibility-inlines-hidden
+endif
+endif
 
 ifdef ENABLE_EXPENSIVE_CHECKS
   # GNU libstdc++ uses RTTI if you define _GLIBCXX_DEBUG, which we did above.