[zorg] r352012 - [jenkins] use a more reliable way to override options

[Adrian Prantl via llvm-commits]

Author: adrian
Date: Wed Jan 23 18:48:27 2019
New Revision: 352012

URL: http://llvm.org/viewvc/llvm-project?rev=352012&view=rev
Log:
[jenkins] use a more reliable way to override options

Modified:
    zorg/trunk/zorg/jenkins/lldb-cmake-matrix-dwarf.sh

Modified: zorg/trunk/zorg/jenkins/lldb-cmake-matrix-dwarf.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/lldb-cmake-matrix-dwarf.sh?rev=352012&r1=352011&r2=352012&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/lldb-cmake-matrix-dwarf.sh (original)
+++ zorg/trunk/zorg/jenkins/lldb-cmake-matrix-dwarf.sh Wed Jan 23 18:48:27 2019
@@ -81,8 +81,8 @@ rsync -av --delete $BASE_BUILD/bin $BUIL
 WRAPPER=$BUILD/bin/clang-dwarf${DWARF_VERSION}
 echo '#!/bin/sh'>${WRAPPER}
 echo '#!/bin/sh'>${WRAPPER}++
-echo ${BASE_BUILD}/bin/clang -gdwarf-${DWARF_VERSION} '$*'>>${WRAPPER}
-echo ${BASE_BUILD}/bin/clang++ -gdwarf-${DWARF_VERSION} '$*'>>${WRAPPER}++
+echo env CCC_OVERRIDE_OPTIONS='"'s/-g/-gdwarf-${DWARF_VERSION}/'"' ${BASE_BUILD}/bin/clang '$*'>>${WRAPPER}
+echo env CCC_OVERRIDE_OPTIONS='"'s/-g/-gdwarf-${DWARF_VERSION}/'"' ${BASE_BUILD}/bin/clang++ '$*'>>${WRAPPER}++
 chmod u+x ${WRAPPER} ${WRAPPER}++
 
 cmake $WORKSPACE/llvm \