From 87d902672f6d42ffa2659603e1117a57da7ac6a8 Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Sun, 3 Oct 1999 02:43:20 +0000 Subject: [PATCH] Fixed the hack for using "../libgcc/Makefile" in libgcc_r/Makefile. ${LIB} was wrong at dependency-parsing time, so dependencies for libgcc_r*.a were wrong. This somehow worked right, except libgcc_r*.a were always out of date. --- gnu/lib/libgcc/Makefile | 2 ++ gnu/lib/libgcc_r/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile index 5727e759019..ee4c5b4b1bf 100644 --- a/gnu/lib/libgcc/Makefile +++ b/gnu/lib/libgcc/Makefile @@ -4,7 +4,9 @@ GCCDIR= ${.CURDIR}/../../../contrib/egcs/gcc .PATH: ${GCCDIR}/cp ${GCCDIR} +.if !defined(LIB) || ${LIB} != "gcc_r" LIB= gcc +.endif # Install libgcc_pic.a, since ld.so uses it. INSTALL_PIC_ARCHIVE= yes diff --git a/gnu/lib/libgcc_r/Makefile b/gnu/lib/libgcc_r/Makefile index 6428ebab121..7f733023e3c 100644 --- a/gnu/lib/libgcc_r/Makefile +++ b/gnu/lib/libgcc_r/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include "../libgcc/Makefile" - LIB= gcc_r CFLAGS+=-D_PTHREADS + +.include "../libgcc/Makefile" -- 2.45.2