From patchwork Wed Aug 1 23:20:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 143322 Delivered-To: patches@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1458979ljj; Wed, 1 Aug 2018 16:20:48 -0700 (PDT) X-Received: by 2002:a62:4083:: with SMTP id f3-v6mr337707pfd.229.1533165648842; Wed, 01 Aug 2018 16:20:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533165648; cv=none; d=google.com; s=arc-20160816; b=eImF6V+QO0jcyIJcGi1WUyBWqUm6GUkv/5lm3Ja47SmpGWNpDCnYQR6jonsZ8HE7j/ e5VPB/ym0eGlqMuwOeVpAq8v2lUdHec3+L+fUJJ6EDcOQic6yv7t/buubIJSwGrVVQQT 5BY7yl19FyPosvO2+rukt0wRM7gfmeXUj2yLTzYR0SC3RN3altRqpyiM38K4tWFiFuzb /4XKaSI1ltZWL0LciTZoH7GGi4oAcG/g4sxKYPngzL7eTMuKHBq8gCS/PG0hyTg0PdhW GlAMJJVeR1b3AaGpCLY3BJlWJQdKifEG5m1vgRj9F98ljXv9kU35zJhI+vjLiJqf5n86 lV+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=DHuui9SmAk8zrusErPGwW0yrxnxnHs2/VJ0S3rVoqSI=; b=zNMK6XZiJ/I2JgQm1TCoo1NQmcV81PLt1sAUynwIl5/k3qPuUnKOGhLyjg/iXeNAYw uoisJiWkeKG8kpxFCNrn30N3pJjpEpUUMINhZ+sTaV9TYCM5TgF8Msi/kQWZQXM708pp WOiPgW0hxCWsbVwtUOLuE1vkF+oieLBqNKleI8K3Kfwh/rtjAiGnvB5XUAKsdZxW/LFY Y+J8GGyMMeJAnGEQ2kpHMdvY1KNLR4A32zKJUk243wt6b6nZImRIPwNB8tfRbONf8FD6 DrOYDGsXde+2bKm8nbH+Ef0bi5LtXmiioJYPzDgD+TYpryOdFikBeI7b1GL6s6t3bL7C GSJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VKXf0b3m; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id b10-v6sor66237pla.73.2018.08.01.16.20.48 for (Google Transport Security); Wed, 01 Aug 2018 16:20:48 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VKXf0b3m; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DHuui9SmAk8zrusErPGwW0yrxnxnHs2/VJ0S3rVoqSI=; b=VKXf0b3mybCtSTJKQidDb8Ky2SDAshL74bHj7HVtlz0U3/KqF5MzhnTpz4w9A8e5ZF 5x/2STGzkQrW16vF1B0hpc7SUueo9cVzXarDTuth67uc9R9X+UltIU0r+NUdTIWATn1q /ZJJb/jgumDMPvWfCQ7E7a1ECEQLgvik7D/3Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=DHuui9SmAk8zrusErPGwW0yrxnxnHs2/VJ0S3rVoqSI=; b=O/+XxCx3n5zSfhiYMu+MPPle3zIjVKZh7f/ftKLQDSQEZLWEPrt9UVeseM9LqqeO00 h+O+NWtZ7FAJMT5iqlJQHY/LOfwzuIIcejDccEBq34ZTdINtI+0qjW/Twq4Kf2ATBuaE nh9pvkAcfEY325bBDRhN2GNFGjyQW/2odw62p2eJLDfwUJpwqdlcHcJLm5IRweUFCrw1 hKVBSX0j0nK/Pmm+T6+G/RO0UCldzrejHZL7FsWPNG501I1SNmJbQAegZBokNRPcTTSv FLUmhCqopyj2yiubxuvUaZAjVqmt+iuuGGZf2+1aWhfEnnArYq2c+apZAsrY48TjA7Gi reqw== X-Gm-Message-State: AOUpUlEVqIGwothK+JAmAt+dwtjmh5iQtKCPbFOPiPyKCllFbV2WxS7W xPAPVApq308x4jqPNrlOs/waFGzo X-Google-Smtp-Source: AAOMgpfiWui3WUPTA8+KHLzHjkDCXVf90cf1zGOyscN4m1ZPv7Wf602pV40fgSh+2/62kAlNnvyWVw== X-Received: by 2002:a17:902:8482:: with SMTP id c2-v6mr279312plo.45.1533165648344; Wed, 01 Aug 2018 16:20:48 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id f186-v6sm150209pgc.4.2018.08.01.16.20.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Aug 2018 16:20:47 -0700 (PDT) From: John Stultz To: mesa-dev@lists.freedesktop.org Cc: Dan Willemsen , Rob Herring , Alistair Strachan , Marissa Wall , Sumit Semwal , Emil Velikov , Rob Clark , John Stultz Subject: [PATCH 3/3 v3] CleanSpec.mk: Remove HOST_OUT_release Date: Wed, 1 Aug 2018 16:20:38 -0700 Message-Id: <1533165638-13664-3-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533165638-13664-1-git-send-email-john.stultz@linaro.org> References: <1533165638-13664-1-git-send-email-john.stultz@linaro.org> From: Dan Willemsen This is a forward port of a patch from the AOSP/master tree: https://android.googlesource.com/platform/external/mesa3d/+/bd633f11de0c6ac1ed333a28344c74fd9898df9e%5E%21/ Which replaces HOST_OUT_release with HOST_OUT As per Dan's explanation, the current code was incorrect to use $(HOST_OUT_release) as $(HOST_OUT) will be set properly for whether the current build that's being cleaned during incrementals is using host debug or release builds. Additionally Dan noted it was incredibly uncommon to use a debug host build, as there was never a shortcut and one had to set an environment variable manually. Thus it was rarely if ever tested. Change-Id: I7972c0a50fa3520dcfa962d6dd7e602bfe22368d Cc: Rob Herring Cc: Alistair Strachan Cc: Marissa Wall Cc: Sumit Semwal Cc: Emil Velikov Cc: Rob Clark Reviewed-by: Emil Velikov Signed-off-by: John Stultz --- v2: Add more justification to the commit message --- CleanSpec.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.7.4 diff --git a/CleanSpec.mk b/CleanSpec.mk index d08b0de..e5030ce 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -10,7 +10,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/STATIC_LIBRARIES/libmesa_*_interm $(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/SHARED_LIBRARIES/i9?5_dri_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/SHARED_LIBRARIES/libglapi_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/SHARED_LIBRARIES/libGLES_mesa_intermediates) -$(call add-clean-step, rm -rf $(HOST_OUT_release)/*/EXECUTABLES/mesa_*_intermediates) -$(call add-clean-step, rm -rf $(HOST_OUT_release)/*/EXECUTABLES/glsl_compiler_intermediates) -$(call add-clean-step, rm -rf $(HOST_OUT_release)/*/STATIC_LIBRARIES/libmesa_*_intermediates) +$(call add-clean-step, rm -rf $(HOST_OUT)/*/EXECUTABLES/mesa_*_intermediates) +$(call add-clean-step, rm -rf $(HOST_OUT)/*/EXECUTABLES/glsl_compiler_intermediates) +$(call add-clean-step, rm -rf $(HOST_OUT)/*/STATIC_LIBRARIES/libmesa_*_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/SHARED_LIBRARIES/*_dri_intermediates)