Merging r244058:

------------------------------------------------------------------------
r244058 | hans | 2015-08-05 08:36:07 -0700 (Wed, 05 Aug 2015) | 1 line

test-release.sh: Fix naming of OpenMP runtime tarball
------------------------------------------------------------------------

git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_37@244118 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/utils/release/test-release.sh b/utils/release/test-release.sh
index f693f7a246f6eb05795d3c6c63c8d349f963702d..568c097badd3ad4c5193296aaaf90e30240d7500 100755 (executable)
--- a/utils/release/test-release.sh
+++ b/utils/release/test-release.sh
@@ -454,7 +454,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