[zorg] r349837 - [zorg] Simplify stage1 build on sanitizer bots

[Vitaly Buka via llvm-commits]

Author: vitalybuka
Date: Thu Dec 20 13:59:46 2018
New Revision: 349837

URL: http://llvm.org/viewvc/llvm-project?rev=349837&view=rev
Log:
[zorg] Simplify stage1 build on sanitizer bots

Modified:
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_functions.sh

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_functions.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_functions.sh?rev=349837&r1=349836&r2=349837&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_functions.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_functions.sh Thu Dec 20 13:59:46 2018
@@ -131,20 +131,14 @@ function build_stage1_clang_at_revison {
     echo @@@BUILD_STEP using pre-built stage1 clang at r$HOST_CLANG_REVISION@@@
   else
     echo @@@BUILD_STEP sync to r$HOST_CLANG_REVISION@@@
-    real_buildbot_revision=$BUILDBOT_REVISION
-    BUILDBOT_REVISION=$HOST_CLANG_REVISION
-    buildbot_update
+    (BUILDBOT_REVISION=$HOST_CLANG_REVISION buildbot_update)
 
     echo @@@BUILD_STEP Clear ${STAGE1_DIR} ${STAGE1_CLOBBER}
     rm -rf ${STAGE1_DIR} ${STAGE1_CLOBBER}
 
     echo @@@BUILD_STEP build stage1 clang at r$HOST_CLANG_REVISION@@@
-
     build_stage1_clang
-
     echo $HOST_CLANG_REVISION > ${STAGE1_DIR}/host_clang_revision
-
-    BUILDBOT_REVISION=$real_buildbot_revision
   fi
 }