[musl-cross-make] litecross: Pass --enable-deterministic-archives to binutils, not gcc

Submitted by Michael Forney on Nov. 6, 2018, 6:36 a.m.

Details

Message ID 20181106063655.12357-1-mforney@mforney.org
State New
Series "litecross: Pass --enable-deterministic-archives to binutils, not gcc"
Headers show

Commit Message

Michael Forney Nov. 6, 2018, 6:36 a.m.
When the gcc and binutils build trees were separated in defdbb4505,
--enable-deterministic-archives was accidentally left in FULL_GCC_CONFIG.
This had the effect of reverting commit e83fe4b8ce, breaking
reproducible builds (unless it was specified explicitly in config.mak).
---
 litecross/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/litecross/Makefile b/litecross/Makefile
index 2f78157..4ecfa93 100644
--- a/litecross/Makefile
+++ b/litecross/Makefile
@@ -61,7 +61,8 @@  FULL_BINUTILS_CONFIG = \
 	--disable-werror \
 	--target=$(TARGET) --prefix= \
 	--libdir=/lib --disable-multilib \
-	--with-sysroot=$(SYSROOT)
+	--with-sysroot=$(SYSROOT) \
+	--enable-deterministic-archives
 
 FULL_GCC_CONFIG = --enable-languages=c,c++ \
 	$(GCC_CONFIG_FOR_TARGET) \
@@ -74,7 +75,6 @@  FULL_GCC_CONFIG = --enable-languages=c,c++ \
 	--disable-libmudflap --disable-libsanitizer \
 	--disable-gnu-indirect-function \
 	--disable-libmpx \
-	--enable-deterministic-archives \
 	--enable-libstdcxx-time
 
 FULL_MUSL_CONFIG = $(MUSL_CONFIG) \

Comments

Michael Forney Feb. 10, 2019, 7:27 p.m.
On 2018-11-05, Michael Forney <mforney@mforney.org> wrote:
> When the gcc and binutils build trees were separated in defdbb4505,
> --enable-deterministic-archives was accidentally left in FULL_GCC_CONFIG.
> This had the effect of reverting commit e83fe4b8ce, breaking
> reproducible builds (unless it was specified explicitly in config.mak).
> ---
>  litecross/Makefile | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/litecross/Makefile b/litecross/Makefile
> index 2f78157..4ecfa93 100644
> --- a/litecross/Makefile
> +++ b/litecross/Makefile
> @@ -61,7 +61,8 @@ FULL_BINUTILS_CONFIG = \
>  	--disable-werror \
>  	--target=$(TARGET) --prefix= \
>  	--libdir=/lib --disable-multilib \
> -	--with-sysroot=$(SYSROOT)
> +	--with-sysroot=$(SYSROOT) \
> +	--enable-deterministic-archives
>
>  FULL_GCC_CONFIG = --enable-languages=c,c++ \
>  	$(GCC_CONFIG_FOR_TARGET) \
> @@ -74,7 +75,6 @@ FULL_GCC_CONFIG = --enable-languages=c,c++ \
>  	--disable-libmudflap --disable-libsanitizer \
>  	--disable-gnu-indirect-function \
>  	--disable-libmpx \
> -	--enable-deterministic-archives \
>  	--enable-libstdcxx-time
>
>  FULL_MUSL_CONFIG = $(MUSL_CONFIG) \
> --
> 2.19.1

Ping. I think this patch should be pretty uncontroversial. It is a
simple fix for a regression introduced in defdbb4505.

Would you prefer a github pull request instead?
Rich Felker Feb. 11, 2019, 11:30 p.m.
On Sun, Feb 10, 2019 at 11:27:21AM -0800, Michael Forney wrote:
> On 2018-11-05, Michael Forney <mforney@mforney.org> wrote:
> > When the gcc and binutils build trees were separated in defdbb4505,
> > --enable-deterministic-archives was accidentally left in FULL_GCC_CONFIG.
> > This had the effect of reverting commit e83fe4b8ce, breaking
> > reproducible builds (unless it was specified explicitly in config.mak).
> > ---
> >  litecross/Makefile | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/litecross/Makefile b/litecross/Makefile
> > index 2f78157..4ecfa93 100644
> > --- a/litecross/Makefile
> > +++ b/litecross/Makefile
> > @@ -61,7 +61,8 @@ FULL_BINUTILS_CONFIG = \
> >  	--disable-werror \
> >  	--target=$(TARGET) --prefix= \
> >  	--libdir=/lib --disable-multilib \
> > -	--with-sysroot=$(SYSROOT)
> > +	--with-sysroot=$(SYSROOT) \
> > +	--enable-deterministic-archives
> >
> >  FULL_GCC_CONFIG = --enable-languages=c,c++ \
> >  	$(GCC_CONFIG_FOR_TARGET) \
> > @@ -74,7 +75,6 @@ FULL_GCC_CONFIG = --enable-languages=c,c++ \
> >  	--disable-libmudflap --disable-libsanitizer \
> >  	--disable-gnu-indirect-function \
> >  	--disable-libmpx \
> > -	--enable-deterministic-archives \
> >  	--enable-libstdcxx-time
> >
> >  FULL_MUSL_CONFIG = $(MUSL_CONFIG) \
> > --
> > 2.19.1
> 
> Ping. I think this patch should be pretty uncontroversial. It is a
> simple fix for a regression introduced in defdbb4505.
> 
> Would you prefer a github pull request instead?

Sorry, it was just an oversight. Applying. Thanks!

Rich