Mercurial > projects > ldc
changeset 1070:39e2f5e4af3d
Automated merge with http://hg.dsource.org/projects/ldc
| author | Christian Kamm <kamm incasoftware de> |
|---|---|
| date | Sun, 08 Mar 2009 17:51:45 +0100 |
| parents | dc576c7e4b1e (diff) 8038b106c458 (current diff) |
| children | 7d9957c6350e |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Sun Mar 08 16:30:39 2009 +0100 +++ b/CMakeLists.txt Sun Mar 08 17:51:45 2009 +0100 @@ -65,6 +65,7 @@ file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/bin ${PROJECT_BINARY_DIR}/${DMDFE_PATH} + ${PROJECT_BINARY_DIR}/gen ) # idgen and impcnvgen
--- a/revisions.pl.in Sun Mar 08 16:30:39 2009 +0100 +++ b/revisions.pl.in Sun Mar 08 17:51:45 2009 +0100 @@ -11,9 +11,9 @@ my $llvm_rev_str; my $llvm_rev_nr; -if ($llvm_rev =~ /^\s*(\d+:)?(?<str>(?<nr>\d+)[MSP]*)\s*$/) { - $llvm_rev_str = qq!#define LLVM_REV_STR "LLVM rev. $+{str}"!; - $llvm_rev_nr = "$+{nr}"; +if ($llvm_rev =~ /^\s*(\d+:)?((\d+)[MSP]*)\s*$/) { + $llvm_rev_str = qq!#define LLVM_REV_STR "LLVM rev. $2"!; + $llvm_rev_nr = "$3"; } else { my $llvm_lib = `perl @LLVM_CONFIG@ --libdir`; $llvm_lib =~ s/\s+$//;