Mercurial > projects > ldc
changeset 466:6989f040ea06
stupid merges
author | Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> |
---|---|
date | Sun, 03 Aug 2008 16:16:16 +0200 |
parents | 5bd9a617d297 (current diff) ea991021a56a (diff) |
children | 261b05cf4d1c |
files | |
diffstat | 5 files changed, 11 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/bin/llvmdc.ini Sun Aug 03 16:11:38 2008 +0200 +++ b/bin/llvmdc.ini Sun Aug 03 16:16:16 2008 +0200 @@ -1,2 +1,2 @@ [Environment] -DFLAGS=-I%@P%/../tango -R%@P%/../lib +DFLAGS=-I%@P%/../tango -I%@P%/../tango/lib/common -I%@P%/../import -L-L%@P%/../lib -R%@P%/../lib
--- a/dmd/root.c Sun Aug 03 16:11:38 2008 +0200 +++ b/dmd/root.c Sun Aug 03 16:16:16 2008 +0200 @@ -324,17 +324,16 @@ f = (char *)mem.malloc(pathlen + 1 + namelen + 1); memcpy(f, path, pathlen); - if (path[pathlen - 1] != '/') + if ( + path[pathlen - 1] != '/' +#if _WIN32 + && path[pathlen - 1] != '\\' && path[pathlen - 1] != ':' +#endif + ) { f[pathlen] = '/'; pathlen++; } -#if _WIN32 - if (path[pathlen - 1] != '\\' && path[pathlen - 1] != ':') - { f[pathlen] = '\\'; - pathlen++; - } -#endif memcpy(f + pathlen, name, namelen + 1); return f; }
--- a/runtime/build.sh Sun Aug 03 16:11:38 2008 +0200 +++ b/runtime/build.sh Sun Aug 03 16:16:16 2008 +0200 @@ -14,4 +14,4 @@ # install the runtime rm -f ../../lib/libtango-base-llvmdc-native.a -cp -s `pwd`/libtango-base-llvmdc-native.a ../../lib +cp `pwd`/libtango-base-llvmdc-native.a ../../lib
--- a/runtime/lib/llvmdc-posix.mak Sun Aug 03 16:11:38 2008 +0200 +++ b/runtime/lib/llvmdc-posix.mak Sun Aug 03 16:16:16 2008 +0200 @@ -35,7 +35,7 @@ ADD_CFLAGS= #ADD_DFLAGS= -ADD_DFLAGS=-I`pwd`/common -I`pwd`/.. -I`pwd`/compiler/llvmdc +ADD_DFLAGS=-I`pwd`/common/ targets : nativelib doc all : nativelib lib doc
--- a/tests/runminitest.d Sun Aug 03 16:11:38 2008 +0200 +++ b/tests/runminitest.d Sun Aug 03 16:16:16 2008 +0200 @@ -49,7 +49,7 @@ auto testname = getName(getBaseName(c)); writefln("TEST NAME: ", testname); - string cmd = format("llvmdc %s -quiet -ofobj/%s -odobj", c, testname); + string cmd = format("llvmdc %s -quiet -ofobj" ~ std.path.sep ~ "%s -odobj", c, testname); foreach(v; args[1..$]) { cmd ~= ' '; cmd ~= v; @@ -61,7 +61,7 @@ compilefailed ~= c; } else if (cl == RUN || cl == NORUN) { - if (system("obj/" ~ testname) != 0) { + if (system("obj" ~ std.path.sep ~ testname) != 0) { if (cl == RUN) runfailed ~= c; }