diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1998-03-06 21:38:04 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1998-03-06 21:38:04 +0000 |
| commit | 5449d50017ac8efc039ad1dbef3b9df50c0b4d4a (patch) | |
| tree | de9991cf450a8894b29d813fb644c132a0eb73f6 | |
| parent | 4d2290c84d94965392eacc3ebcb8d9eb74559e10 (diff) | |
Do not install a ${arch}-unknown-openbsd2.x link
| -rw-r--r-- | gnu/usr.bin/gcc/Makefile.bsd-wrapper | 7 | ||||
| -rw-r--r-- | gnu/usr.bin/gcc/Makefile.in | 9 |
2 files changed, 12 insertions, 4 deletions
diff --git a/gnu/usr.bin/gcc/Makefile.bsd-wrapper b/gnu/usr.bin/gcc/Makefile.bsd-wrapper index a57f125015f..eb77826136c 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.32 1998/03/04 03:55:34 millert Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.33 1998/03/06 21:38:01 niklas Exp $ MAN= cccp.1 gcc.1 cp/g++.1 f/g77.1 MLINKS+= gcc.1 cc.1 @@ -71,8 +71,9 @@ install: maninstall INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \ infodir=${DESTDIR}/usr/share/info \ build_infodir=. \ - tooldir=/tmp assertdir=/tmp INSTALL_MAN= NO_TARGET_GCC=true \ - bindir=${DESTDIR}/usr/bin install + tooldir=/tmp assertdir=/tmp INSTALL_DRIVER=install-driver \ + INSTALL_MAN= NO_TARGET_GCC=true bindir=${DESTDIR}/usr/bin \ + install ln -f ${DESTDIR}/usr/bin/gcc ${DESTDIR}/usr/bin/cc chown -R ${BINOWN}.${BINGRP} ${DESTDIR}/usr/lib/gcc-lib chmod -R a+rX ${DESTDIR}/usr/lib/gcc-lib diff --git a/gnu/usr.bin/gcc/Makefile.in b/gnu/usr.bin/gcc/Makefile.in index 106e5a29a32..80ad429fcad 100644 --- a/gnu/usr.bin/gcc/Makefile.in +++ b/gnu/usr.bin/gcc/Makefile.in @@ -300,6 +300,9 @@ ENQUIRE = enquire # libgcc1-test target (must also be overridable for a target) LIBGCC1_TEST = libgcc1-test +# Specify the target for installing the compiler driver +INSTALL_DRIVER = install-driver-with-alias + # List of extra executables that should be compiled for this target machine # that are used for compiling from source code to object code. # The rules for compiling them should be in the t-* file for the machine. @@ -2160,7 +2163,7 @@ install: $(INSTALL_TARGET) ; @true # Install the driver last so that the window when things are # broken is small. install-normal: install-common $(INSTALL_HEADERS) $(INSTALL_LIBGCC) \ - $(INSTALL_MAN) install-info lang.install-normal install-driver + $(INSTALL_MAN) install-info lang.install-normal $(INSTALL_DRIVER) # Do nothing while making gcc with a cross-compiler. The person who # makes gcc for the target machine has to know how to put a complete @@ -2270,6 +2273,10 @@ install-driver: xgcc else \ rm -f $(bindir)/$(GCC_INSTALL_NAME)$(exeext); \ $(INSTALL_PROGRAM) xgcc$(exeext) $(bindir)/$(GCC_INSTALL_NAME)$(exeext); \ + fi + +install-driver-with-alias: install-driver + -if [ ! -f gcc-cross$(exeext) ] ; then \ rm -f $(bindir)/$(target_alias)-gcc-1$(exeext); \ ln $(bindir)/$(GCC_INSTALL_NAME)$(exeext) $(bindir)/$(target_alias)-gcc-1$(exeext) \ > /dev/null 2>&1 \ |