toolchain/toolchain-wrapper: let recent GCC handle SOURCE_DATE_EPOCH
PATCH 1/1 toolchain/toolchain-wrapper: let recent GCC handle SOURCE_DATE_EPOCH
When using precompiled headers, changing any macros defined on the command line will invalidate the precompiled header. With toolchain-wrapper adding __DATE__ and __TIME__, any commits to Buildroot will invalidate incremental builds regardless of whether the precompiled header actually uses those values (affecting _OVERRIDE_SRCDIR).
GCC-7 and later support SOURCE_DATE_EPOCH and use it to define __DATE__ and __TIME__ internally, avoiding any impact on precompiled headers.
Disable the custom handling in toolchain-wrapper if GCC is version 7 or newer.
--- toolchain/toolchain-wrapper.c | 10 ++++++++++ toolchain/toolchain-wrapper.mk | 3 +++ 2 files changed, 13 insertions(+)
toolchain/toolchain-wrapper.c +10 -0
@@ -179,6 +179,7 @@ static void check_unsafe_path(const char *arg, } } +#ifdef BR_NEED_SOURCE_DATE_EPOCH /* Returns false if SOURCE_DATE_EPOCH was not defined in the environment. * * Returns true if SOURCE_DATE_EPOCH is in the environment and represent
@@ -232,6 +233,15 @@ bool parse_source_date_epoch_from_env(void) }return true; } +#else +bool parse_source_date_epoch_from_env (void ) +{ +/* The compiler is recent enough to handle SOURCE_DATE_EPOCH itself +* so we do not need to do anything here. +*/ +return false; +} +#endif int main (int argc,char **argv) {
toolchain/toolchain-wrapper.mk +3 -0
@@ -28,6 +28,9 @@ TOOLCHAIN_WRAPPER_OPTS += -ffile-prefix-map=$(BASE_DIR)=buildroot else TOOLCHAIN_WRAPPER_OPTS += -D__FILE__=\"\" -D__BASE_FILE__=\"\" -Wno-builtin-macro-redefined endif +ifneq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_7),y) +TOOLCHAIN_WRAPPER_OPTS += -DBR_NEED_SOURCE_DATE_EPOCH +endif endif # We create a list like '"-mfoo", "-mbar", "-mbarfoo"' so that each flag is a
Signature · 1 line
2.27.0
Thomas Petazzoni
AppliedPATCH 1/1 toolchain/toolchain-wrapper: let recent GCC handle SOURCE_DATE_EPOCH
Quoted 9 lines · On Fri, 26 Jun 2020 16:49:27 +0100 John Keeping <[email protected]> wrote:
When using precompiled headers, changing any macros defined on the command line will invalidate the precompiled header. With toolchain-wrapper adding
__DATE__and__TIME__, any commits to Buildroot will invalidate incremental builds regardless of whether the precompiled header actually uses those values (affecting_OVERRIDE_SRCDIR).GCC-7 and later support
SOURCE_DATE_EPOCHand use it to define__DATE__and__TIME__internally, avoiding any impact on precompiled headers.
Quoted 8 lines
Disable the custom handling in toolchain-wrapper if GCC is version 7 or newer.
Signed-off-by John Keeping <[email protected]>--- toolchain/toolchain-wrapper.c | 10 ++++++++++ toolchain/toolchain-wrapper.mk | 3 +++ 2 files changed, 13 insertions(+)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 toolchain/toolchain-wrapper: let recent GCC handle SOURCE_DATE_EPOCH
In reply to John KeepingQuoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"John" == John Keeping <[email protected]> writes:
When using precompiled headers, changing any macros defined on the command line will invalidate the precompiled header. With toolchain-wrapper adding
__DATE__and__TIME__, any commits to Buildroot will invalidate incremental builds regardless of whether the precompiled header actually uses those values (affecting_OVERRIDE_SRCDIR).
Quoted 7 lines
GCC-7 and later support
SOURCE_DATE_EPOCHand use it to define__DATE__and__TIME__internally, avoiding any impact on precompiled headers.Disable the custom handling in toolchain-wrapper if GCC is version 7 or newer.
Signed-off-by John Keeping <[email protected]>
Seems pretty safe to add, so:
Committed to 2020.02.x and 2020.05.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard