diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2018-05-22 18:57:07 +0300 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2018-08-29 11:15:57 +0800 |
| commit | 9000b48966335b0b3d7a3ec1ec8c15b045d59e9d (patch) | |
| tree | f30a2944c71ef2f9a8f4265ce49f14302b3860c7 | |
| parent | builtin: Use test_access from NetBSD when faccessat is unavailable (diff) | |
| download | dash-9000b48966335b0b3d7a3ec1ec8c15b045d59e9d.tar.gz dash-9000b48966335b0b3d7a3ec1ec8c15b045d59e9d.zip | |
shell: Don't include config.h for native helpers
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>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| -rw-r--r-- | src/Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 46399c7..8b9eb8c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,11 +2,10 @@ AM_YFLAGS = -d COMMON_CFLAGS = -Wall COMMON_CPPFLAGS = \ - -include $(top_builddir)/config.h \ -DBSD=1 -DSHELL 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) |