D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-03-01 10:03:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make ldc compatible with LLVM 3.4

Browse Source 
Development of LLVM 3.4 started with a cleanup of the path class (PathV1).
The changes here let ldc compile at least with rev. 184039 of LLVM.
This commit is contained in:
kai
2013-06-14 06:50:38 +02:00
parent fe455fe1a8
commit f1c71e4bac
7 changed files with 88 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
driver/configfile.cpp
View File

@@ -12,6 +12,9 @@
#include "libconfig.h++"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/Path.h"
#if LDC_LLVM_VER >= 304
#include "llvm/Support/PathV1.h"
#endif
#include <cassert>
#include <cstring>
#include <iostream>
@@ -19,12 +22,38 @@
#if _WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <shlobj.h>
// Prevent name clash with LLVM
#undef GetCurrentDirectory
#endif
namespace sys = llvm::sys;
#if LDC_LLVM_VER >= 304
#if _WIN32
sys::Path GetUserHomeDirectory() {
char buff[MAX_PATH];
HRESULT res = SHGetFolderPathA(NULL,
CSIDL_FLAG_CREATE | CSIDL_APPDATA,
NULL,
SHGFP_TYPE_CURRENT,
buff);
if (res != S_OK)
assert(0 && "Failed to get user home directory");
return sys::Path(buff);
}
#else
sys::Path GetUserHomeDirectory() {
const char* home = getenv("HOME");
Path result;
if (home && result.set(home))
return result;
result.set("/");
return result;
}
#endif
#endif
#if _WIN32
static bool ReadPathFromRegistry(sys::Path& p)
{
@@ -81,7 +110,11 @@ bool ConfigFile::locate(sys::Path& p, const char* argv0, void* mainAddr, const c
// user configuration
// try ~/.ldc
#if LDC_LLVM_VER >= 304
p = GetUserHomeDirectory();
#else
p = sys::Path::GetUserHomeDirectory();
#endif
p.appendComponent(".ldc");
p.appendComponent(filename);
if (sys::fs::exists(p.str()))
@@ -89,7 +122,11 @@ bool ConfigFile::locate(sys::Path& p, const char* argv0, void* mainAddr, const c
#if _WIN32
// try home dir
#if LDC_LLVM_VER >= 304
p = GetUserHomeDirectory();
#else
p = sys::Path::GetUserHomeDirectory();
#endif
p.appendComponent(filename);
if (sys::fs::exists(p.str()))
return true;