# HG changeset patch # User Christian Kamm # Date 1236531105 -3600 # Node ID 39e2f5e4af3d221dd3261503b6ac3ce6238ab537 # Parent dc576c7e4b1ea6667c672119e387567c6d9638db# Parent 8038b106c458ace7a123f817b0d2d942dd357baf Automated merge with http://hg.dsource.org/projects/ldc diff -r 8038b106c458 -r 39e2f5e4af3d CMakeLists.txt --- 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 diff -r 8038b106c458 -r 39e2f5e4af3d revisions.pl.in --- 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+:)?(?(?\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+$//;