From patchwork Thu Jul 26 18:28:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 142994 Delivered-To: patches@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp778411ljj; Thu, 26 Jul 2018 11:28:57 -0700 (PDT) X-Received: by 2002:a62:d8c:: with SMTP id 12-v6mr3249891pfn.202.1532629737380; Thu, 26 Jul 2018 11:28:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532629737; cv=none; d=google.com; s=arc-20160816; b=AEAYJ99TK+bW5b0lIaheu8phR1TsIIqwJtFOZ6/NT60KN7GZhYIB9944DlEXPy3nF7 1aFIRTDpu8J8qT71D2wpPWKhW3uhY4+goNHrqbpXLFnW1MQmq1dDrOyuo0xuQJIcC40r xZwEpZatKgpVXWkBVpEZycdPxdNGaXCb0Br0fCaouz6GDhWUPfUn9fY3NAe7P6bKZtj9 6DaNc8bPJudm6z9vzGGW2KFkWslxf4HijFF4+9PP3u21JqtA5DAZHodPvJINnTKwLZRV ncbS84IvsnBNZkemu7/RbtbAQaDHnqg8J1O1vtRW38AlgxWmjhCMKXT4g9Wz+t2vF+Ji L0xQ== 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=dKyEWheUob1Rmp4nnD2a4my2FenBRKZudLQcnNlq0YI=; b=eRrvBQLV7szflqZvqYvfpocq4KBZ3dO2JVRcixjGvf5U44eRbl/Ue23gwmErLMDMrr hEbYnyopyaqP8OW9HBHTkjjklIP+mr6wTgERddSGUR82jpVxll0BkN/LhtuwM2x0VjPD YVR3n1kQdijQUKONWZ+TTAu2iXsDCYvOJZER+UmDHnWa8Ycv/Vx9sUy6hVv4xtWo7d/W nF9tmJ/26R68LiwdmJFNJG6GKGlUR+C/WXNxlyt5s+YySC7e7ZnyLlPveoEuzwqeCXbc JwDLbOtLsKtLa2kLiLPqc6tRIBwRgh7Eih5bAQ2fLQ9R+CxH7pEralQaf1lrv1dnummT Pzmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="XEXO/yI8"; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 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-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id n10-v6sor621844pfj.65.2018.07.26.11.28.57 for (Google Transport Security); Thu, 26 Jul 2018 11:28:57 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="XEXO/yI8"; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 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=dKyEWheUob1Rmp4nnD2a4my2FenBRKZudLQcnNlq0YI=; b=XEXO/yI8pGNwHX3uJKgZXbF/0CDQvUcB/haiYXBv0pZcNeZbKHsobIN6rOTpoLRLj7 pfKGzXrqG236w+C/+qrKWRtYu3W4zHUt6o/SS+mTIVqoQScfZg86cDfP/LFZv+G56Nd4 DeM1vc2xcw6MATX0X0Lshc5v2408vbg5IPtCQ= 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=dKyEWheUob1Rmp4nnD2a4my2FenBRKZudLQcnNlq0YI=; b=IClxIhyCRucYsIfIaW6xVc/BcVNsGZhXXz+avMZavQ/CbB7y3kmO9FYbZc6hrkokg8 LEoj6YgIG7nBACXB1KqPKxDlFNK3Qfw92QsNkOiupuLElvmQxRVaq4+im1zBN+vnTF1o T1A0JS0RBzThStU/6BmNCoCJIifR8t3DrsZMCTg59rn4tArXIc+ITtoXupaTUL66zZUL ElJAH1nBYwGpJ8xGzDDzmUT5RVvIaV51/gS8isqwUxkwA1EewkGV6TPrkWxTS3a1fVu/ aoLiSanCSuULYlxP1HyPgj/htx3VKAQ+0oikJVFEFiMGlQ8scB1zuutzIsBfcRh3n6F1 JnFw== X-Gm-Message-State: AOUpUlHcZ1bQ7pceh7sSd2+0mMnfmedkism0oeUoPbQ7OLMEczNu5BF2 WuOAPet9bzQDiMXeeFqgFMm8rDfH X-Google-Smtp-Source: AAOMgpfoF0JHO1hGEMssipTZ3digXDijKUmW8n4QC7NLrgw2oFvujK+0eekk+AVDquIhvjXYYQGHLQ== X-Received: by 2002:a62:c0c4:: with SMTP id g65-v6mr3234970pfk.72.1532629736882; Thu, 26 Jul 2018 11:28:56 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:600:5100:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id u9-v6sm8646966pfi.104.2018.07.26.11.28.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Jul 2018 11:28:55 -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 v2] CleanSpec.mk: Remove HOST_OUT_release Date: Thu, 26 Jul 2018 11:28:46 -0700 Message-Id: <1532629726-17441-3-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1532629726-17441-1-git-send-email-john.stultz@linaro.org> References: <1532629726-17441-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. 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)