Index: libcxx/cmake/caches/AIX.cmake
===================================================================
--- libcxx/cmake/caches/AIX.cmake
+++ libcxx/cmake/caches/AIX.cmake
@@ -9,11 +9,12 @@
 set(LIBCXX_ENABLE_ASSERTIONS OFF CACHE BOOL "")
 set(LIBCXX_ABI_VERSION "1" CACHE STRING "")
 set(LIBCXX_ENABLE_ABI_LINKER_SCRIPT OFF CACHE BOOL "")
-set(LIBCXX_ENABLE_SHARED ON CACHE BOOL "")
-set(LIBCXX_ENABLE_STATIC OFF CACHE BOOL "")
-set(LIBCXXABI_ENABLE_SHARED ON CACHE BOOL "")
-set(LIBCXXABI_ENABLE_STATIC OFF CACHE BOOL "")
 set(LIBCXX_CXX_ABI libcxxabi CACHE STRING "")
 set(LIBCXXABI_USE_LLVM_UNWINDER ON CACHE BOOL "")
-set(LIBUNWIND_ENABLE_SHARED ON CACHE BOOL "")
-set(LIBUNWIND_ENABLE_STATIC OFF CACHE BOOL "")
+
+# Avoid conflicts in the output names, since AIX shared  and static libraries
+# are both archived by some CMake versions.
+set(LIBCXX_STATIC_OUTPUT_NAME "c++-static" CACHE STRING "Output name for the static libc++ runtime library.")
+set(LIBCXXABI_STATIC_OUTPUT_NAME "c++abi-static" CACHE STRING "Output name for the static libc++abi runtime library.")
+set(LIBUNWIND_STATIC_OUTPUT_NAME "unwind-static" CACHE STRING "Output name for the static libunwind runtime library.")
+