diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2004-01-15 17:46:54 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2004-01-15 17:46:54 +0000 |
| commit | 4da99081e0fca5080d27710445aaa64ab2d0d2b3 (patch) | |
| tree | ddf9ad1550b5fa71a798f5b1302f4cd0ecf2f55e /gnu | |
| parent | b728ac7bf80cf4da535639fd5cda062030421590 (diff) | |
install compiler/arch-dependent headers.
ok millert@
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/usr.bin/gcc/Makefile.bsd-wrapper | 23 | ||||
| -rw-r--r-- | gnu/usr.bin/gcc/gcc/config/openbsd.h | 5 |
2 files changed, 22 insertions, 6 deletions
diff --git a/gnu/usr.bin/gcc/Makefile.bsd-wrapper b/gnu/usr.bin/gcc/Makefile.bsd-wrapper index 3282d9eced0..d3c93e6ab3b 100644 --- a/gnu/usr.bin/gcc/Makefile.bsd-wrapper +++ b/gnu/usr.bin/gcc/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.40 2003/11/29 14:55:05 espie Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.41 2004/01/15 17:46:53 espie Exp $ #MAN= cccp.1 gcc.1 gcc-local.1 protoize.1 gcov.1 MAN= gcc.1 cpp.1 gcov.1 @@ -14,6 +14,7 @@ MAN+= f/g77.1 MLINKS+= gcc.1 g++.1 gcc.1 c++.1 MLINKS+= g77.1 f77.1 .endif +V=3.3.2 .SUFFIXES: .1 .PATH.1: ${.CURDIR}/gcc ${.CURDIR}/gcc/doc @@ -57,6 +58,7 @@ M_ARCH= ${MACHINE_ARCH} GCCARCH= ${M_ARCH}-unknown-openbsd${OSREV} +GCCINC= /usr/lib/gcc-lib/${GCCARCH}/$V/include all: config.status exec ${MAKE} ${MAKE_FLAGS} all doc @@ -109,7 +111,7 @@ install: maninstall target_path infodir=/usr/share/info \ tooldir=/tmp assertdir=/tmp \ bindir=$(BINDIR) \ - install-common install-headers install-multilib \ + install-common install-multilib \ install-info intl.install \ lang.install-normal chown -R ${BINOWN}:${BINGRP} ${DESTDIR}/usr/lib/gcc-lib @@ -140,6 +142,23 @@ clean cleandir: depend: config.status exec ${MAKE} ${MAKE_FLAGS} generated-manpages +FILES= ${.CURDIR}/gcc/unwind.h +.if ${M_ARCH} == "i386" +FILES+=${.CURDIR}/gcc/config/i386/mmintrin.h \ + ${.CURDIR}/gcc/config/i386/xmmintrin.h +.elif ${M_ARCH} == "powerpc" +FILES+=${.CURDIR}/gcc/config/rs6000/altivec.h +.endif + +includes: + mkdir -p ${DESTDIR}${GCCINC} + for i in ${FILES}; do \ + j=`basename $$i`; \ + cmp -s $$i ${DESTDIR}${GCCINC}/$$j || \ + ${INSTALL} ${INSTALL_COPY} -m 444 $$i ${DESTDIR}${GCCINC}/$$j; \ + ln -sf ${GCCINC}/$$j ${DESTDIR}/usr/include/$$j; \ + done + lint: # Nothing here so far... diff --git a/gnu/usr.bin/gcc/gcc/config/openbsd.h b/gnu/usr.bin/gcc/gcc/config/openbsd.h index 78501ac3470..0e1e8544c3b 100644 --- a/gnu/usr.bin/gcc/gcc/config/openbsd.h +++ b/gnu/usr.bin/gcc/gcc/config/openbsd.h @@ -52,9 +52,6 @@ Boston, MA 02111-1307, USA. */ #ifdef OPENBSD_NATIVE -#undef GCC_INCLUDE_DIR -#define GCC_INCLUDE_DIR "/usr/include" - /* The compiler is configured with ONLY the gcc/g++ standard headers. */ #undef INCLUDE_DEFAULTS #define INCLUDE_DEFAULTS \ @@ -62,7 +59,7 @@ Boston, MA 02111-1307, USA. */ { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1 }, \ { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1 },\ { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1 }, \ - { GCC_INCLUDE_DIR, "GCC", 0, 0 }, \ + { STANDARD_INCLUDE_DIR, STANDARD_INCLUDE_COMPONENT, 0, 0 }, \ { 0, 0, 0, 0 } \ } |