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.
This commit is contained in:
parent
1cb7d2af50
commit
0810229e75
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=117496
@ -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"
|
||||
|
@ -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. */
|
||||
|
Loading…
Reference in New Issue
Block a user