Author: hans Date: Tue Jan 19 11:28:24 2016 New Revision: 258146 URL: http://llvm.org/viewvc/llvm-project?rev=258146&view=rev Log: Merging r257905: ------------------------------------------------------------------------ r257905 | hans | 2016-01-15 09:04:45 -0800 (Fri, 15 Jan 2016) | 3 lines
test-release.sh: Fix clang-tools-extra symlink for CMake build The CMake and Autoconf builds want the symlink set up differently. ------------------------------------------------------------------------ Modified: llvm/branches/release_38/ (props changed) llvm/branches/release_38/utils/release/test-release.sh Propchange: llvm/branches/release_38/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 19 11:28:24 2016 @@ -1,3 +1,3 @@ /llvm/branches/Apple/Pertwee:110850,110961 /llvm/branches/type-system-rewrite:133420-134817 -/llvm/trunk:155241,257645,257648,257730,257791 +/llvm/trunk:155241,257645,257648,257730,257791,257905 Modified: llvm/branches/release_38/utils/release/test-release.sh URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_38/utils/release/test-release.sh?rev=258146&r1=258145&r2=258146&view=diff ============================================================================== --- llvm/branches/release_38/utils/release/test-release.sh (original) +++ llvm/branches/release_38/utils/release/test-release.sh Tue Jan 19 11:28:24 2016 @@ -288,10 +288,20 @@ function export_sources() { if [ ! -h clang ]; then ln -s ../../cfe.src clang fi - cd $BuildDir/llvm.src/tools/clang/tools - if [ ! -h extra ]; then - ln -s ../../../../clang-tools-extra.src extra + + # The autoconf and CMake builds want different symlinks here: + if [ "$use_autoconf" = "yes" ]; then + cd $BuildDir/llvm.src/tools/clang/tools + if [ ! -h extra ]; then + ln -s ../../../../clang-tools-extra.src extra + fi + else + cd $BuildDir/cfe.src/tools + if [ ! -h extra ]; then + ln -s ../../clang-tools-extra.src extra + fi fi + cd $BuildDir/llvm.src/projects if [ -d $BuildDir/test-suite.src ] && [ ! -h test-suite ]; then ln -s ../../test-suite.src test-suite _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits