| Peter Korsgaard | cbcc06c | 2010-07-22 00:22:22 +0200 | [diff] [blame] | 1 | [PATCH] Don't include config.h when building helpers using the native compiler |
| 2 | |
| 3 | config.h contains settings for the cross compiler (most importantly |
| 4 | 32/64bit versions of functions), so don't include it when calling the |
| 5 | native compiler to build the helpers. |
| 6 | |
| 7 | Otherwise we get build errors like: |
| 8 | |
| 9 | /usr/bin/gcc -include ../config.h -DBSD=1 -DSHELL -DIFS_BROKEN -g -O2 -Wall -o mkinit mkinit.c |
| 10 | In file included from /usr/include/sys/stat.h:107, |
| 11 | from /usr/include/fcntl.h:38, |
| 12 | from mkinit.c:50: |
| 13 | /usr/include/bits/stat.h:117: error: redefinition of ‘struct stat’ |
| 14 | In file included from /usr/include/fcntl.h:38, |
| 15 | from mkinit.c:50: |
| 16 | /usr/include/sys/stat.h:504: error: redefinition of ‘stat’ |
| 17 | /usr/include/sys/stat.h:455: note: previous definition of ‘stat’ was here |
| 18 | |
| 19 | Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> |
| 20 | --- |
| 21 | src/Makefile.in | 1 - |
| 22 | 1 file changed, 1 deletion(-) |
| 23 | |
| 24 | Index: dash-0.5.5.1/src/Makefile.in |
| 25 | =================================================================== |
| 26 | --- dash-0.5.5.1.orig/src/Makefile.in |
| 27 | +++ dash-0.5.5.1/src/Makefile.in |
| 28 | @@ -165,7 +165,6 @@ COMMON_CPPFLAGS = \ |
| 29 | AM_CFLAGS = $(COMMON_CFLAGS) |
| 30 | AM_CPPFLAGS = $(COMMON_CPPFLAGS) |
| 31 | AM_CFLAGS_FOR_BUILD = -g -O2 $(COMMON_CFLAGS) |
| 32 | -AM_CPPFLAGS_FOR_BUILD = $(COMMON_CPPFLAGS) |
| 33 | COMPILE_FOR_BUILD = \ |
| 34 | $(CC_FOR_BUILD) $(AM_CPPFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) \ |
| 35 | $(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) |