diff options
| author | kan <kan@FreeBSD.org> | 2003-07-13 02:41:48 +0000 |
|---|---|---|
| committer | kan <kan@FreeBSD.org> | 2003-07-13 02:41:48 +0000 |
| commit | 3d589bbdc6c02e3f17de523b7b5a1fa958ce63a3 (patch) | |
| tree | 69ad1d6eb3d28e8c177abe30c906a9a497d8d0bc /gnu | |
| parent | e2e7d96885ff05e5505952a9196276b22fd3c2db (diff) | |
| download | FreeBSD-src-3d589bbdc6c02e3f17de523b7b5a1fa958ce63a3.zip FreeBSD-src-3d589bbdc6c02e3f17de523b7b5a1fa958ce63a3.tar.gz | |
Including dynamically generated osreldate.h wasn't such a good
idea after all.
Fix cross-builds and ia64 builds. gnu/lib/csu/Makefile is modified to
pre-include osreldate.h and gnu/usr.bin/cc/cc_tools/auto-host.h
will avoid including sys/param.h if __FreeBSD_version is already defined.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/lib/csu/Makefile | 1 | ||||
| -rw-r--r-- | gnu/usr.bin/cc/cc_tools/auto-host.h | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/gnu/lib/csu/Makefile b/gnu/lib/csu/Makefile index 6d977b4..bb3007a 100644 --- a/gnu/lib/csu/Makefile +++ b/gnu/lib/csu/Makefile @@ -23,6 +23,7 @@ MKDEPCMD= CC="${CC}" MKDEP_CPP_OPTS="-M -DCRT_BEGIN" mkdep BEGINSRC= crtbegin.asm ENDSRC= crtend.asm CFLAGS+= -x assembler-with-cpp # Ugly hack +CFLAGS+= -include osreldate.h .undef SRCS # hack for 'make depend' .endif .if ${MACHINE_ARCH} == "powerpc" diff --git a/gnu/usr.bin/cc/cc_tools/auto-host.h b/gnu/usr.bin/cc/cc_tools/auto-host.h index b40593c..175d72a 100644 --- a/gnu/usr.bin/cc/cc_tools/auto-host.h +++ b/gnu/usr.bin/cc/cc_tools/auto-host.h @@ -1,6 +1,8 @@ /* $FreeBSD$ */ -#include <osreldate.h> +#ifndef __FreeBSD_version +#include <sys/param.h> +#endif /* auto-host.h. Generated automatically by configure. */ /* config.in. Generated automatically from configure.in by autoheader. */ |
