From a46254e93ec2bce8f593bccdedf9a5f0f7c884a6 Mon Sep 17 00:00:00 2001
From: Oliver Chang <oliverchang@users.noreply.github.com>
Date: Tue, 14 Mar 2017 13:54:19 -0700
Subject: [PATCH] Override $OUT in gcb build. (#456)

This prevents a copy from the builder container's /out to /workspace/out/sanitizer. Should hopefully fix ffmpeg's disk space issues.
---
 infra/gcb/build.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/infra/gcb/build.py b/infra/gcb/build.py
index 895a6fdd3..6429dc9b2 100755
--- a/infra/gcb/build.py
+++ b/infra/gcb/build.py
@@ -95,7 +95,7 @@ def get_build_steps(project_yaml):
     ]
 
   for sanitizer in project_yaml['sanitizers']:
-    env = CONFIGURATIONS["sanitizer-" + sanitizer]
+    env = CONFIGURATIONS["sanitizer-" + sanitizer][:]
     out = '/workspace/out/' + sanitizer
     stamped_name = name + '-' + sanitizer + '-' + ts
     zip_file = stamped_name + '.zip'
@@ -105,6 +105,8 @@ def get_build_steps(project_yaml):
     srcmap_url = get_signed_url('/{0}/{1}/{2}'.format(
         UPLOAD_BUCKET, name, stamped_srcmap_file))
 
+    env.append('OUT=' + out)
+
     build_steps.extend([
         # compile
         {'name': image,
@@ -112,7 +114,7 @@ def get_build_steps(project_yaml):
           'args': [
             'bash',
             '-c',
-            'cd /src/{1} && compile && mkdir -p {0} && cp -Rv /out/* {0}/'.format(out, name),
+            'cd /src/{1} && mkdir -p {0} && compile'.format(out, name),
             ],
           },
         # zip binaries