From 9c53cc323a2a3490f74f8993373edf94ae176e7f Mon Sep 17 00:00:00 2001
From: Abhishek Arya <inferno@chromium.org>
Date: Sun, 17 May 2020 22:13:28 -0700
Subject: [PATCH] Add fuzzing language correctly during compile step. (#3837)

---
 infra/gcb/build_lib.py     | 1 -
 infra/gcb/build_project.py | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra/gcb/build_lib.py b/infra/gcb/build_lib.py
index 2c1e71b0c..0fe22bbd9 100644
--- a/infra/gcb/build_lib.py
+++ b/infra/gcb/build_lib.py
@@ -184,7 +184,6 @@ def project_image_steps(name, image, language):
           '.',
       ],
       'dir': 'oss-fuzz/projects/' + name,
-      'env': ['FUZZING_LANGUAGE=%s' % language],
   }, {
       'name':
           image,
diff --git a/infra/gcb/build_project.py b/infra/gcb/build_project.py
index 16a62ef28..e9d0480a4 100644
--- a/infra/gcb/build_project.py
+++ b/infra/gcb/build_project.py
@@ -161,6 +161,7 @@ def get_build_steps(project_dir):
         env.append('OUT=' + out)
         env.append('MSAN_LIBS_PATH=/workspace/msan')
         env.append('ARCHITECTURE=' + architecture)
+        env.append('FUZZING_LANGUAGE=' + language)
 
         workdir = workdir_from_dockerfile(dockerfile_path)
         if not workdir: