[llvm-branch-commits] [llvm-branch] r244118 - Merging r244058:

[Hans Wennborg]

Author: hans
Date: Wed Aug  5 15:46:22 2015
New Revision: 244118

URL: http://llvm.org/viewvc/llvm-project?rev=244118&view=rev
Log:
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
------------------------------------------------------------------------

Modified:
    llvm/branches/release_37/   (props changed)
    llvm/branches/release_37/utils/release/test-release.sh

Propchange: llvm/branches/release_37/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug  5 15:46:22 2015
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,242236,242239,242281,242288,242296,242331,242341,242410,242412,242433-242434,242442,242543,242673,242680,242706,242721-242722,242733-242735,242742,242869,242919,242993,243001,243057,243116,243263,243294,243361,243469,243485,243500,243519,243531,243589,243609,243636,243638-243640,243745,243898,243984,243986
+/llvm/trunk:155241,242236,242239,242281,242288,242296,242331,242341,242410,242412,242433-242434,242442,242543,242673,242680,242706,242721-242722,242733-242735,242742,242869,242919,242993,243001,243057,243116,243263,243294,243361,243469,243485,243500,243519,243531,243589,243609,243636,243638-243640,243745,243898,243984,243986,244058

Modified: llvm/branches/release_37/utils/release/test-release.sh
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_37/utils/release/test-release.sh?rev=244118&r1=244117&r2=244118&view=diff
==============================================================================
--- llvm/branches/release_37/utils/release/test-release.sh (original)
+++ llvm/branches/release_37/utils/release/test-release.sh Wed Aug  5 15:46:22 2015
@@ -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