From b1e0a268b1d49d7055b198b60f0f01da650b11d2 Mon Sep 17 00:00:00 2001
From: Alexey Lapshin <alexey.lapshin@espressif.com>
Date: Wed, 28 Aug 2024 14:39:43 +0700
Subject: [PATCH] fix reproducible builds between native and cross builds

---
 config/global/paths.in                   | 2 +-
 samples/riscv32-esp-elf/crosstool.config | 1 -
 samples/xtensa-esp-elf/crosstool.config  | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/config/global/paths.in b/config/global/paths.in
index e4cf7024c..995aff257 100644
--- a/config/global/paths.in
+++ b/config/global/paths.in
@@ -53,7 +53,7 @@ config WORK_DIR
 
 config BUILD_TOP_DIR
     string
-    default "${CT_WORK_DIR:-${CT_TOP_DIR}/.build}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TARGET}"
+    default "${CT_WORK_DIR:-${CT_TOP_DIR}/.build}/${CT_TARGET}"
 
 config BUILD_DIR
     string
diff --git a/samples/riscv32-esp-elf/crosstool.config b/samples/riscv32-esp-elf/crosstool.config
index b3e8fb487..9b9bcd452 100644
--- a/samples/riscv32-esp-elf/crosstool.config
+++ b/samples/riscv32-esp-elf/crosstool.config
@@ -1,7 +1,6 @@
 CT_CONFIG_VERSION="4"
 CT_EXPERIMENTAL=y
 CT_PREFIX_DIR="${CT_TOP_DIR}/builds/${CT_TARGET}"
-CT_BUILD_TOP_DIR="${CT_WORK_DIR:-${CT_TOP_DIR}/.build}/${CT_TARGET}"
 
 CT_ARCH_RISCV=y
 CT_ARCH="riscv"
diff --git a/samples/xtensa-esp-elf/crosstool.config b/samples/xtensa-esp-elf/crosstool.config
index 501defae8..aedd3472c 100644
--- a/samples/xtensa-esp-elf/crosstool.config
+++ b/samples/xtensa-esp-elf/crosstool.config
@@ -1,7 +1,6 @@
 CT_CONFIG_VERSION="4"
 CT_EXPERIMENTAL=y
 CT_PREFIX_DIR="${CT_TOP_DIR}/builds/${CT_TARGET}"
-CT_BUILD_TOP_DIR="${CT_WORK_DIR:-${CT_TOP_DIR}/.build}/${CT_TARGET}"
 
 CT_ARCH_XTENSA=y
 CT_ARCH="xtensa"