From 235fed831da833259edaeeb21aa567749c9fe673 Mon Sep 17 00:00:00 2001 From: David Nadlinger Date: Sat, 12 Nov 2011 11:33:04 +0100 Subject: [PATCH] Search for LDC-specific modules first. This commit flips the order of the import paths so that the directories we install our stuff to are searched first. This avoids problems if DMD's has been installed to the same directory. --- ldc2.rebuild.conf.in | 2 +- ldc2_install.conf.in | 2 +- ldc_install.conf.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ldc2.rebuild.conf.in b/ldc2.rebuild.conf.in index 5dc1bb12..4947fe77 100644 --- a/ldc2.rebuild.conf.in +++ b/ldc2.rebuild.conf.in @@ -1,2 +1,2 @@ [Environment] -DFLAGS=-I@INCLUDE_INSTALL_DIR@ -L-L@CMAKE_INSTALL_LIBDIR@ -defaultlib=@RUNTIME_AIO@ -debuglib=@RUNTIME_AIO@ +DFLAGS=-I@INCLUDE_INSTALL_DIR@/phobos -I-I@INCLUDE_INSTALL_DIR@/ldc -I@INCLUDE_INSTALL_DIR@ -L-L@CMAKE_INSTALL_LIBDIR@ -defaultlib=@RUNTIME_AIO@ -debuglib=@RUNTIME_AIO@ diff --git a/ldc2_install.conf.in b/ldc2_install.conf.in index 506c2826..ab5a41ee 100644 --- a/ldc2_install.conf.in +++ b/ldc2_install.conf.in @@ -7,9 +7,9 @@ default: // 'switches' holds array of string that are appends to the command line // arguments before they are parsed. switches = [ - "-I@INCLUDE_INSTALL_DIR@", "-I@INCLUDE_INSTALL_DIR@/phobos", "-I@INCLUDE_INSTALL_DIR@/ldc", + "-I@INCLUDE_INSTALL_DIR@", "-L-L@CMAKE_INSTALL_LIBDIR@", "-defaultlib=lphobos2", "-debuglib=lphobos2" diff --git a/ldc_install.conf.in b/ldc_install.conf.in index ede2d8b4..a98e32b8 100644 --- a/ldc_install.conf.in +++ b/ldc_install.conf.in @@ -7,9 +7,9 @@ default: // 'switches' holds array of string that are appends to the command line // arguments before they are parsed. switches = [ - "-I@INCLUDE_INSTALL_DIR@", "-I@INCLUDE_INSTALL_DIR@/@RUNTIME_AIO@", "-I@INCLUDE_INSTALL_DIR@/ldc", + "-I@INCLUDE_INSTALL_DIR@", "-L-L@CMAKE_INSTALL_LIBDIR@", "-d-version=Tango", "-defaultlib=@RUNTIME_AIO@",