From 5a181386f01fbb63c74178688289a67a05caf15f Mon Sep 17 00:00:00 2001 From: Fabian Meumertzheim Date: Thu, 20 Jan 2022 12:20:07 +0100 Subject: [PATCH] Do not set user defined env variables twice for (c)make These variables are already exported in the build script prelude and thus don't have to be set on individual make commands. --- foreign_cc/private/make_env_vars.bzl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/foreign_cc/private/make_env_vars.bzl b/foreign_cc/private/make_env_vars.bzl index c61858401..4c0b328e1 100644 --- a/foreign_cc/private/make_env_vars.bzl +++ b/foreign_cc/private/make_env_vars.bzl @@ -123,10 +123,8 @@ def _get_make_variables(workspace_name, tools, flags, user_env_vars): vars.update(tools_dict) - # Put all other environment variables, passed by the user - for user_var in user_env_vars: - if not vars.get(user_var): - vars[user_var] = [user_env_vars[user_var]] + # Do not put in the other user-defined env variables at this point as they + # have already been exported globally by the prelude. return vars