From f1079bfbf672e4af85f2ce9ca131abde55691a60 Mon Sep 17 00:00:00 2001 From: Sven-Hendrik Haase Date: Wed, 6 Jun 2012 14:54:39 +0200 Subject: [PATCH] Fix typos --- ldc2.conf.in | 2 +- ldc2_install.conf.in | 2 +- ldc2_phobos.conf.in | 2 +- runtime/CMakeLists.txt | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ldc2.conf.in b/ldc2.conf.in index aab1a26e..9bf4fb5b 100644 --- a/ldc2.conf.in +++ b/ldc2.conf.in @@ -10,7 +10,7 @@ default: "-I@PROJECT_BINARY_DIR@/../import", "-I@RUNTIME_DIR@/import", "-I@RUNTIME_DIR@/src", - "-L-L@PROJECT_BINARY_DIR@/../lib", @MUTILIB_ADDITIONAL_PATH@ + "-L-L@PROJECT_BINARY_DIR@/../lib", @MULTILIB_ADDITIONAL_PATH@ "-defaultlib=@RUNTIME_AIO@", "-debuglib=@RUNTIME_AIO@" ]; diff --git a/ldc2_install.conf.in b/ldc2_install.conf.in index d242c273..4abffca3 100644 --- a/ldc2_install.conf.in +++ b/ldc2_install.conf.in @@ -9,7 +9,7 @@ default: switches = [ "-I@INCLUDE_INSTALL_DIR@/ldc", "-I@INCLUDE_INSTALL_DIR@", - "-L-L@CMAKE_INSTALL_LIBDIR@", @MUTILIB_ADDITIONAL_INSTALL_PATH@ + "-L-L@CMAKE_INSTALL_LIBDIR@", @MULTILIB_ADDITIONAL_INSTALL_PATH@ "-defaultlib=phobos-ldc", "-debuglib=phobos-ldc" ]; diff --git a/ldc2_phobos.conf.in b/ldc2_phobos.conf.in index 1e8d68c3..6c43e547 100644 --- a/ldc2_phobos.conf.in +++ b/ldc2_phobos.conf.in @@ -11,7 +11,7 @@ default: "-I@RUNTIME_DIR@/import", "-I@RUNTIME_DIR@/src", "-I@PHOBOS2_DIR@/", - "-L-L@PROJECT_BINARY_DIR@/../lib", @MUTILIB_ADDITIONAL_PATH@ + "-L-L@PROJECT_BINARY_DIR@/../lib", @MULTILIB_ADDITIONAL_PATH@ "-defaultlib=phobos-ldc", "-debuglib=phobos-ldc" ]; diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index 672ebf8e..089b782a 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -153,8 +153,8 @@ endif(NOT LDC_LOC) # if(MULTILIB) - set(MUTILIB_ADDITIONAL_PATH "\n \"-L-L${CMAKE_BINARY_DIR}/lib${MULTILIB_SUFFIX}\",") - set(MUTILIB_ADDITIONAL_INSTALL_PATH "\n \"-L-L${CMAKE_INSTALL_PREFIX}/lib${MULTILIB_SUFFIX}\",") + set(MULTILIB_ADDITIONAL_PATH "\n \"-L-L${CMAKE_BINARY_DIR}/lib${MULTILIB_SUFFIX}\",") + set(MULTILIB_ADDITIONAL_INSTALL_PATH "\n \"-L-L${CMAKE_INSTALL_PREFIX}/lib${MULTILIB_SUFFIX}\",") endif(MULTILIB) configure_file(${PROJECT_PARENT_DIR}/${CONFIG_NAME}.conf.in ${PROJECT_BINARY_DIR}/../bin/${LDC_EXE}.conf)