diff -ruN llvm-9999_ORIG/CMakeLists.txt llvm-9999/CMakeLists.txt --- llvm-9999_ORIG/CMakeLists.txt 2014-12-31 11:12:20.431415886 +0100 +++ llvm-9999/CMakeLists.txt 2014-12-31 11:13:46.695414556 +0100 @@ -132,11 +132,9 @@ string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) -set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" ) - # They are used as destination of target generators. set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) -set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) +set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib) if(WIN32 OR CYGWIN) # DLL platform -- put DLLs into bin. set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) @@ -153,6 +151,7 @@ set(LLVM_EXAMPLES_BINARY_DIR ${LLVM_BINARY_DIR}/examples) set(LLVM_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/include) +set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" ) set(LLVM_ALL_TARGETS AArch64 @@ -484,8 +483,8 @@ # They are not referenced. See set_output_directory(). set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/bin ) -set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} ) -set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} ) +set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib ) +set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib ) set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) if (APPLE) @@ -493,7 +492,7 @@ set(CMAKE_INSTALL_RPATH "@executable_path/../lib") else(UNIX) if(NOT DEFINED CMAKE_INSTALL_RPATH) - set(CMAKE_INSTALL_RPATH "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}") + set(CMAKE_INSTALL_RPATH "\$ORIGIN/../lib") if (${CMAKE_SYSTEM_NAME} MATCHES FreeBSD) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,origin") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,origin") diff -ruN llvm-9999_ORIG/autoconf/configure.ac llvm-9999/autoconf/configure.ac --- llvm-9999_ORIG/autoconf/configure.ac 2014-12-31 11:12:20.431415886 +0100 +++ llvm-9999/autoconf/configure.ac 2014-12-31 11:13:34.351414747 +0100 @@ -2017,11 +2017,6 @@ clang_src_root="$srcdir/tools/clang" fi if test -f ${clang_src_root}/README.txt; then - dnl Clang supports build systems which use the multilib libdir suffix. - dnl The autoconf system doesn't support this so stub out that variable. - AC_DEFINE_UNQUOTED(CLANG_LIBDIR_SUFFIX,"", - [Multilib suffix for libdir.]) - dnl Use variables to stay under 80 columns. configh="include/clang/Config/config.h" doxy="docs/doxygen.cfg" diff -ruN llvm-9999_ORIG/cmake/modules/CMakeLists.txt llvm-9999/cmake/modules/CMakeLists.txt --- llvm-9999_ORIG/cmake/modules/CMakeLists.txt 2014-12-31 11:12:20.431415886 +0100 +++ llvm-9999/cmake/modules/CMakeLists.txt 2014-12-31 11:13:46.695414556 +0100 @@ -58,7 +58,7 @@ get_filename_component(LLVM_INSTALL_PREFIX \"\${LLVM_INSTALL_PREFIX}\" PATH)") endforeach(p) set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/include") -set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/lib\${LLVM_LIBDIR_SUFFIX}") +set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/lib") set(LLVM_CONFIG_CMAKE_DIR "\${LLVM_INSTALL_PREFIX}/${LLVM_INSTALL_PACKAGE_DIR}") set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/bin") set(LLVM_CONFIG_EXPORTS_FILE "\${LLVM_CMAKE_DIR}/LLVMExports.cmake") diff -ruN llvm-9999_ORIG/cmake/modules/LLVMConfig.cmake.in llvm-9999/cmake/modules/LLVMConfig.cmake.in --- llvm-9999_ORIG/cmake/modules/LLVMConfig.cmake.in 2014-12-31 11:12:20.431415886 +0100 +++ llvm-9999/cmake/modules/LLVMConfig.cmake.in 2014-12-31 11:13:42.631414619 +0100 @@ -40,8 +40,6 @@ set(LLVM_ON_UNIX @LLVM_ON_UNIX@) set(LLVM_ON_WIN32 @LLVM_ON_WIN32@) -set(LLVM_LIBDIR_SUFFIX @LLVM_LIBDIR_SUFFIX@) - set(LLVM_INCLUDE_DIRS "@LLVM_CONFIG_INCLUDE_DIRS@") set(LLVM_LIBRARY_DIRS "@LLVM_CONFIG_LIBRARY_DIRS@") set(LLVM_DEFINITIONS "-D__STDC_LIMIT_MACROS" "-D__STDC_CONSTANT_MACROS") diff -ruN llvm-9999_ORIG/configure llvm-9999/configure --- llvm-9999_ORIG/configure 2014-12-31 11:12:20.431415886 +0100 +++ llvm-9999/configure 2014-12-31 11:13:34.355414747 +0100 @@ -18458,12 +18458,6 @@ clang_src_root="$srcdir/tools/clang" fi if test -f ${clang_src_root}/README.txt; then - -cat >>confdefs.h <<_ACEOF -#define CLANG_LIBDIR_SUFFIX "" -_ACEOF - - configh="include/clang/Config/config.h" doxy="docs/doxygen.cfg" ac_config_headers="$ac_config_headers tools/clang/${configh}:${clang_src_root}/${configh}.in" diff -ruN llvm-9999_ORIG/include/llvm/Config/config.h.in llvm-9999/include/llvm/Config/config.h.in --- llvm-9999_ORIG/include/llvm/Config/config.h.in 2014-12-31 11:12:20.423415887 +0100 +++ llvm-9999/include/llvm/Config/config.h.in 2014-12-31 11:13:34.359414747 +0100 @@ -9,9 +9,6 @@ /* Define if we have libxml2 */ #undef CLANG_HAVE_LIBXML -/* Multilib suffix for libdir. */ -#undef CLANG_LIBDIR_SUFFIX - /* Relative directory for resource files */ #undef CLANG_RESOURCE_DIR diff -ruN llvm-9999_ORIG/tools/llvm-config/BuildVariables.inc.in llvm-9999/tools/llvm-config/BuildVariables.inc.in --- llvm-9999_ORIG/tools/llvm-config/BuildVariables.inc.in 2014-12-31 11:12:20.435415886 +0100 +++ llvm-9999/tools/llvm-config/BuildVariables.inc.in 2014-12-31 11:13:38.859414677 +0100 @@ -23,6 +23,5 @@ #define LLVM_LDFLAGS "@LLVM_LDFLAGS@" #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@" #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" -#define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" diff -ruN llvm-9999_ORIG/tools/llvm-config/Makefile llvm-9999/tools/llvm-config/Makefile --- llvm-9999_ORIG/tools/llvm-config/Makefile 2014-12-31 11:12:20.435415886 +0100 +++ llvm-9999/tools/llvm-config/Makefile 2014-12-31 11:13:38.859414677 +0100 @@ -59,8 +59,6 @@ >> temp.sed $(Verb) $(ECHO) 's/@LLVM_BUILDMODE@/$(subst /,\/,$(BuildMode))/' \ >> temp.sed - $(Verb) $(ECHO) 's/@LLVM_LIBDIR_SUFFIX@//' \ - >> temp.sed $(Verb) $(ECHO) 's/@LLVM_SYSTEM_LIBS@/$(subst /,\/,$(LLVM_SYSTEM_LIBS))/' \ >> temp.sed $(Verb) $(ECHO) 's/@LLVM_TARGETS_BUILT@/$(subst /,\/,$(TARGETS_TO_BUILD))/' \ diff -ruN llvm-9999_ORIG/tools/llvm-config/llvm-config.cpp llvm-9999/tools/llvm-config/llvm-config.cpp --- llvm-9999_ORIG/tools/llvm-config/llvm-config.cpp 2014-12-31 11:12:20.435415886 +0100 +++ llvm-9999/tools/llvm-config/llvm-config.cpp 2014-12-31 11:13:38.859414677 +0100 @@ -243,18 +243,16 @@ case MakefileStyle: ActivePrefix = ActiveObjRoot; ActiveBinDir = ActiveObjRoot + "/" + build_mode + "/bin"; - ActiveLibDir = - ActiveObjRoot + "/" + build_mode + "/lib" + LLVM_LIBDIR_SUFFIX; + ActiveLibDir = ActiveObjRoot + "/" + build_mode + "/lib"; break; case CMakeStyle: ActiveBinDir = ActiveObjRoot + "/bin"; - ActiveLibDir = ActiveObjRoot + "/lib" + LLVM_LIBDIR_SUFFIX; + ActiveLibDir = ActiveObjRoot + "/lib"; break; case CMakeBuildModeStyle: ActivePrefix = ActiveObjRoot; ActiveBinDir = ActiveObjRoot + "/bin/" + build_mode; - ActiveLibDir = - ActiveObjRoot + "/lib" + LLVM_LIBDIR_SUFFIX + "/" + build_mode; + ActiveLibDir = ActiveObjRoot + "/lib/" + build_mode; break; } @@ -265,7 +263,7 @@ ActivePrefix = CurrentExecPrefix; ActiveIncludeDir = ActivePrefix + "/include"; ActiveBinDir = ActivePrefix + "/bin"; - ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; + ActiveLibDir = ActivePrefix + "/lib"; ActiveIncludeOption = "-I" + ActiveIncludeDir; } diff -ruN llvm-9999_ORIG/tools/llvm-shlib/CMakeLists.txt llvm-9999/tools/llvm-shlib/CMakeLists.txt --- llvm-9999_ORIG/tools/llvm-shlib/CMakeLists.txt 2014-12-31 11:12:20.431415886 +0100 +++ llvm-9999/tools/llvm-shlib/CMakeLists.txt 2014-12-31 11:13:46.699414556 +0100 @@ -57,7 +57,7 @@ foreach (lib ${LIB_NAMES}) - set(LIB_DIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) + set(LIB_DIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib) set(LIB_NAME ${LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${lib}) set(LIB_PATH ${LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}) set(LIB_EXPORTS_PATH ${LIB_NAME}.exports) diff -ruN llvm-9999_ORIG/unittests/CMakeLists.txt llvm-9999/unittests/CMakeLists.txt --- llvm-9999_ORIG/unittests/CMakeLists.txt 2014-12-31 11:12:20.295415889 +0100 +++ llvm-9999/unittests/CMakeLists.txt 2014-12-31 11:13:46.699414556 +0100 @@ -4,7 +4,7 @@ if (APPLE) set(CMAKE_INSTALL_RPATH "@executable_path/../../lib") else(UNIX) - set(CMAKE_INSTALL_RPATH "\$ORIGIN/../../lib${LLVM_LIBDIR_SUFFIX}") + set(CMAKE_INSTALL_RPATH "\$ORIGIN/../../lib") endif() function(add_llvm_unittest test_dirname)