Release script: correctly symlink clang-tools-extra into the build (PR22765)

[oota-llvm.git] / utils / release / test-release.sh

diff --git a/utils/release/test-release.sh b/utils/release/test-release.sh
index a10e4fd9a16b56218cc3d29bc7f87cd4fa8ff71d..f6fa52f3308c5c22f9765ca771afe2d2c1113056 100755 (executable)
--- a/utils/release/test-release.sh
+++ b/utils/release/test-release.sh
@@ -282,9 +282,9 @@ function export_sources() {
     if [ ! -h clang ]; then
         ln -s ../../cfe.src clang
     fi
-    cd $BuildDir/llvm.src/tools/clang/tools
-    if [ ! -h clang-tools-extra ]; then
-        ln -s ../../../../clang-tools-extra.src extra
+    cd $BuildDir/cfe.src/tools
+    if [ ! -h extra ]; then
+        ln -s ../../clang-tools-extra.src extra
     fi
     cd $BuildDir/llvm.src/projects
     if [ -d $BuildDir/test-suite.src ] && [ ! -h test-suite ]; then
@@ -470,7 +470,12 @@ function build_OpenMP() {
     echo "# ${MAKE} install DESTDIR=$BuildDir/Phase3/openmp.install"
     ${MAKE} install DESTDIR=$BuildDir/Phase3/openmp.install
 
-    OpenMPPackage=OpenMP-$Triple
+    OpenMPPackage=OpenMP-$Release
+    if [ $RC != "final" ]; then
+        OpenMPPackage=$OpenMPPackage-$RC
+    fi
+    OpenMPPackage=$OpenMPPackage-$Triple
+
     mv $BuildDir/Phase3/openmp.install/usr/local $BuildDir/$OpenMPPackage
     cd $BuildDir
     tar cvfJ $BuildDir/$OpenMPPackage.tar.xz $OpenMPPackage