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

Merge branch 'release-0.11.0'.

Browse Source 
Conflicts:
	cmake/Modules/FindLLVM.cmake
	runtime/phobos
This commit is contained in:
David Nadlinger
2013-06-05 17:50:16 +02:00
parent 905da30ce1 c41ef6b95e
commit 25522ea8b0
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/Modules/FindLLVM.cmake
View File

@@ -24,10 +24,15 @@
# Try suffixed versions to pick up the newest LLVM install available on Debian
# derivatives.
# We also want an user-specified LLVM_ROOT_DIR to take precedence over the
# system default locations such as /usr/local/bin. Executing find_program()
# multiples times is the approach recommended in the docs.
set(llvm_config_names llvm-config-3.3 llvm-config-3.2 llvm-config-3.1 llvm-config)
find_program(LLVM_CONFIG
NAMES llvm-config-3.3 llvm-config-3.2 llvm-config-3.1 llvm-config
PATHS ${LLVM_ROOT_DIR}/bin
NAMES ${llvm_config_names}
PATHS ${LLVM_ROOT_DIR}/bin NO_DEFAULT_PATH
DOC "Path to llvm-config tool.")
find_program(LLVM_CONFIG NAMES ${llvm_config_names})
if (NOT LLVM_CONFIG)
if (WIN32)

2
runtime/phobos

Submodule runtime/phobos updated: 4d8ca34057...8f636073a3