diff options
| author | mrg <mrg@NetBSD.org> | 2006-06-03 22:40:38 +0000 |
|---|---|---|
| committer | mrg <mrg@NetBSD.org> | 2006-06-03 22:40:38 +0000 |
| commit | 100e6c8e216367e98be9d272af01fce36348e61c (patch) | |
| tree | 254cb03da3c4183185879bc28afe26e3607d4121 /gnu/lib/libobjc4 | |
| parent | b3c28e1d6462feb38df1f89dc202ca2bfc25ec02 (diff) | |
actually use the local generated options.h rather than the empty version
from the libgcc build dir. this should fix powerpc build issues.
Diffstat (limited to 'gnu/lib/libobjc4')
| -rw-r--r-- | gnu/lib/libobjc4/Makefile | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/gnu/lib/libobjc4/Makefile b/gnu/lib/libobjc4/Makefile index d4abf121ccc..a8bc9177105 100644 --- a/gnu/lib/libobjc4/Makefile +++ b/gnu/lib/libobjc4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2006/05/23 10:59:03 mrg Exp $ +# $NetBSD: Makefile,v 1.5 2006/06/03 22:40:38 mrg Exp $ REQUIRETOOLS= yes NOLINT= # defined @@ -33,7 +33,7 @@ GCCLIBXX= ${NETBSDSRCDIR}/gnu/lib/libstdc++-v3_4/arch/${MACHINE_ARCH} SRCS= ${G_OBJS:N[A-Z]*:Nlinking.lo:.lo=.c} ${G_OBJS:M[A-Z]*:.lo=.m} linking.m GCPPFLAGS= ${G_ALL_CFLAGS} ${G_INCLUDES} -CPPFLAGS+= -I. -I${GCCARCH} -I${LIBGCCOBJ} ${GCPPFLAGS:M-D*} ${GCPPFLAGS:M-I*:N-I.*} +CPPFLAGS+= -I. -I${GCCARCH} ${GCPPFLAGS:M-D*} ${GCPPFLAGS:M-I*:N-I.*} CPPFLAGS+= -I${GCCLIBXX} BUILDSYMLINKS= ${.CURDIR}/../libstdc++-v3_4/arch/${MACHINE_ARCH} bits @@ -74,22 +74,32 @@ ${FAKEHEADERS}: tm.h ${SRCS}: ${FAKEHEADERS} CLEANFILES+= ${FAKEHEADERS} -${SRCS}: unwind.h +${SRCS}: tconfig.h unwind.h options.h + +# XXX really should put this, and others, in a common Makefile.foo.inc +tconfig.h: + ${_MKTARGET_CREATE} + TARGET_CPU_DEFAULT="" \ + HEADERS="$(G_xm_include_list)" DEFINES="USED_FOR_TARGET $(G_xm_defines)" \ + ${HOST_SH} $(GNUHOSTDIST)/gcc/mkconfig.sh tconfig.h + unwind.h: ${G_UNWIND_H} ${_MKTARGET_CREATE} rm -f ${.TARGET} ln -s ${G_UNWIND_H} ${.TARGET} -CLEANFILES+= unwind.h + +CLEANFILES+= tconfig.h unwind.h # XXX just while all platforms defs.mk are updated.. .if exists(${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk) -CLEANFILES+= options.h optionlist optionlist: ${G_ALL_OPT_FILES) Makefile ${DIST}/gcc/opt-gather.awk ${AWK} -f ${DIST}/gcc/opt-gather.awk ${G_ALL_OPT_FILES} > ${.TARGET} options.h: optionlist ${DIST}/gcc/opt-functions.awk ${DIST}/gcc/opth-gen.awk ${AWK} -f ${DIST}/gcc/opt-functions.awk -f ${DIST}/gcc/opth-gen.awk \ < optionlist > ${.TARGET} + +CLEANFILES+= options.h optionlist .endif .else |
