Don't include config.h for native helpers

Message ID	359646bbed23a3f01a5b726e8b1b5c83feaa27da.1527004627.git.baruch@tkos.co.il (mailing list archive)
State	Accepted
Delegated to:	Herbert Xu
Headers	show Return-Path: <dash-owner@kernel.org> From: Baruch Siach <baruch@tkos.co.il> To: dash@vger.kernel.org Cc: Peter Korsgaard <peter@korsgaard.com>, Baruch Siach <baruch@tkos.co.il> Subject: [PATCH] Don't include config.h for native helpers Date: Tue, 22 May 2018 18:57:07 +0300 Message-Id: <359646bbed23a3f01a5b726e8b1b5c83feaa27da.1527004627.git.baruch@tkos.co.il> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: dash-owner@vger.kernel.org Precedence: bulk

Message ID

359646bbed23a3f01a5b726e8b1b5c83feaa27da.1527004627.git.baruch@tkos.co.il (mailing list archive)

State

Accepted

Delegated to:

Herbert Xu

Headers

From: Baruch Siach <baruch@tkos.co.il>
To: dash@vger.kernel.org
Cc: Peter Korsgaard <peter@korsgaard.com>, Baruch Siach <baruch@tkos.co.il>
Subject: [PATCH] Don't include config.h for native helpers
Date: Tue, 22 May 2018 18:57:07 +0300
Message-Id: <359646bbed23a3f01a5b726e8b1b5c83feaa27da.1527004627.git.baruch@tkos.co.il>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Sender: dash-owner@vger.kernel.org
Precedence: bulk

Commit Message

Baruch Siach May 22, 2018, 3:57 p.m. UTC

From: Peter Korsgaard <peter@korsgaard.com>

config.h contains settings for the cross compiler (most importantly
32/64bit versions of functions), so don't include it when calling the
native compiler to build the helpers.

Otherwise we get build errors like:

/usr/bin/gcc -include ../config.h -DBSD=1 -DSHELL -DIFS_BROKEN  -g -O2 -Wall    -o mkinit mkinit.c
In file included from /usr/include/sys/stat.h:107,
                 from /usr/include/fcntl.h:38,
                 from mkinit.c:50:
/usr/include/bits/stat.h:117: error: redefinition of ‘struct stat’
In file included from /usr/include/fcntl.h:38,
                 from mkinit.c:50:
/usr/include/sys/stat.h:504: error: redefinition of ‘stat’
/usr/include/sys/stat.h:455: note: previous definition of ‘stat’ was here

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
[baruch: apply to Makefile.am; update Peter's email address]
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 src/Makefile.am | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Herbert Xu Aug. 29, 2018, 3:36 a.m. UTC | #1

On Tue, May 22, 2018 at 06:57:07PM +0300, Baruch Siach wrote:
> From: Peter Korsgaard <peter@korsgaard.com>
> 
> config.h contains settings for the cross compiler (most importantly
> 32/64bit versions of functions), so don't include it when calling the
> native compiler to build the helpers.
> 
> Otherwise we get build errors like:
> 
> /usr/bin/gcc -include ../config.h -DBSD=1 -DSHELL -DIFS_BROKEN  -g -O2 -Wall    -o mkinit mkinit.c
> In file included from /usr/include/sys/stat.h:107,
>                  from /usr/include/fcntl.h:38,
>                  from mkinit.c:50:
> /usr/include/bits/stat.h:117: error: redefinition of ‘struct stat’
> In file included from /usr/include/fcntl.h:38,
>                  from mkinit.c:50:
> /usr/include/sys/stat.h:504: error: redefinition of ‘stat’
> /usr/include/sys/stat.h:455: note: previous definition of ‘stat’ was here
> 
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
> [baruch: apply to Makefile.am; update Peter's email address]
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>

Patch applied.  Thanks.

diff --git a/src/Makefile.am b/src/Makefile.am
index 139355e5b7e9..55780f4689da 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,12 +2,11 @@  AM_YFLAGS = -d
 
 COMMON_CFLAGS = -Wall
 COMMON_CPPFLAGS = \
-	-include $(top_builddir)/config.h \
 	-DBSD=1 -DSHELL \
 	-DIFS_BROKEN
 
 AM_CFLAGS = $(COMMON_CFLAGS)
-AM_CPPFLAGS = $(COMMON_CPPFLAGS)
+AM_CPPFLAGS = -include $(top_builddir)/config.h $(COMMON_CPPFLAGS)
 AM_CFLAGS_FOR_BUILD = -g -O2 $(COMMON_CFLAGS) 
 AM_CPPFLAGS_FOR_BUILD = $(COMMON_CPPFLAGS)