From: Paul Spooren <mail@aparcar.org>
Date: Fri, 22 Aug 2025 07:52:59 +0000 (+0200)
Subject: include: always set macro-prefix-map for reproducibility
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Firemap;p=thirdparty%2Fopenwrt.git

include: always set macro-prefix-map for reproducibility

The current implementation either adds macro-prefix-map XOR file-prefix-map (if
REPRODUCIBLE_DEBUG_INFO is defined). Let's have the former always active to
improve the reproducibility.

Signed-off-by: Paul Spooren <mail@aparcar.org>
---

diff --git a/rules.mk b/rules.mk
index 929d8e00e8d..4b72e218e89 100644
--- a/rules.mk
+++ b/rules.mk
@@ -174,7 +174,7 @@ else
 endif
 
 ifeq ($(or $(CONFIG_EXTERNAL_TOOLCHAIN),$(CONFIG_TARGET_uml)),)
-  iremap = -f$(if $(CONFIG_REPRODUCIBLE_DEBUG_INFO),file,macro)-prefix-map=$(1)=$(2)
+  iremap = -fmacro-prefix-map=$(1)=$(2) $(if $(CONFIG_REPRODUCIBLE_DEBUG_INFO),-ffile-prefix-map=$(1)=$(2))
 endif
 
 PACKAGE_DIR?=$(BIN_DIR)/packages