From c4414a2f3f577a20aa379c77063f96a38a630d90 Mon Sep 17 00:00:00 2001
From: Alexey Prokhin <alexey.prokhin@yandex.ru>
Date: Tue, 6 Mar 2012 12:10:02 +0400
Subject: [PATCH] CMake: fixed path to phobos

---
 ldc2_phobos.conf.in    |  4 ++--
 runtime/CMakeLists.txt | 16 +++++++---------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/ldc2_phobos.conf.in b/ldc2_phobos.conf.in
index d4400c02..1e8d68c3 100644
--- a/ldc2_phobos.conf.in
+++ b/ldc2_phobos.conf.in
@@ -12,7 +12,7 @@ default:
         "-I@RUNTIME_DIR@/src",
         "-I@PHOBOS2_DIR@/",
         "-L-L@PROJECT_BINARY_DIR@/../lib", @MUTILIB_ADDITIONAL_PATH@
-        "-defaultlib=phobos2-ldc",
-        "-debuglib=phobos2-ldc"
+        "-defaultlib=phobos-ldc",
+        "-debuglib=phobos-ldc"
     ];
 };
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index c5455fc1..4e212e04 100644
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -13,8 +13,10 @@ endif()
 include(CheckTypeSize)
 check_type_size(void*  ptr_size)
 if(${ptr_size} MATCHES "^8$") ## if it's 64-bit OS
-    set(IS_64BIT_OS 1)
-endif(${ptr_size} MATCHES "^8$")
+    set(MULTILIB_SUFFIX 32)
+else()
+    set(MULTILIB_SUFFIX 64)
+endif()
 
 set(DMDFE_MINOR_VERSION   0                                                             CACHE INT     "Minor version of dmd frontend")
 set(DMDFE_PATCH_VERSION   58                                                            CACHE INT     "Patch version of dmd frontend")
@@ -136,8 +138,8 @@ endif(NOT LDC_LOC)
 #
 
 if(MULTILIB)
-    set(MUTILIB_ADDITIONAL_PATH         "\n        \"-L-L${CMAKE_BINARY_DIR}/lib32\",")
-    set(MUTILIB_ADDITIONAL_INSTALL_PATH "\n        \"-L-L${CMAKE_INSTALL_PREFIX}/lib32\",")
+    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}\",")
 endif(MULTILIB)
 
 configure_file(${PROJECT_PARENT_DIR}/${CONFIG_NAME}.conf.in ${PROJECT_BINARY_DIR}/../bin/${LDC_EXE}.conf)
@@ -335,11 +337,7 @@ endif(PHOBOS2_DIR)
 build_runtime("" "" "" "" "${LIB_SUFFIX}")
 set(GENERATE_DI "")
 if(MULTILIB)
-    if(IS_64BIT_OS)
-        build_runtime("-m32" "-m32" "-m32" "" "32")
-    else(IS_64BIT_OS)
-        build_runtime("-m64" "-m64" "-m64" "" "64")
-    endif(IS_64BIT_OS)
+    build_runtime("-m${MULTILIB_SUFFIX}" "-m${MULTILIB_SUFFIX}" "-m${MULTILIB_SUFFIX}" "" "${MULTILIB_SUFFIX}")
 endif(MULTILIB)
 
 #