From be69ad802b2dd38984d94756aeb639ca6614a3b1 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Mon, 23 Oct 2000 04:50:32 +0000 Subject: * Makefile.common (LIBGCC): Acommodate older gcc's that don't need libstdc++.a. --- winsup/ChangeLog | 5 +++++ winsup/Makefile.common | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/winsup/ChangeLog b/winsup/ChangeLog index 74617df..3e72052 100644 --- a/winsup/ChangeLog +++ b/winsup/ChangeLog @@ -1,3 +1,8 @@ +Mon Oct 23 00:50:02 2000 Christopher Faylor + + * Makefile.common (LIBGCC): Acommodate older gcc's that don't need + libstdc++.a. + Sat Oct 21 18:01:22 2000 Christopher Faylor * Makefile.common (LIBGCC): Find libstdc++.a as well as libc.a since diff --git a/winsup/Makefile.common b/winsup/Makefile.common index 86ac71f..629c1e5 100644 --- a/winsup/Makefile.common +++ b/winsup/Makefile.common @@ -85,8 +85,14 @@ c=-E o=.E endif -LIBGCC:=${subst \,/,${shell $(CC_FOR_TARGET) -print-libgcc-file-name; exec $(CC_FOR_TARGET) -print-file-name=libstdc++.a}} -GCC_INCLUDE:=${dir ${word 1,$(LIBGCC)}}/include +libstdcxx:=${subst \,/,${shell $(CC_FOR_TARGET) -print-file-name=libstdc++.a}} +ifeq ($(libstdcxx),${notdir $(libstdcxx)}) +LIBGCC+=${subst \,/,${shell $(CC_FOR_TARGET) -print-libgcc-file-name}} +else +LIBGCC:=${subst \,/,${shell $(CC_FOR_TARGET) -print-libgcc-file-name}} $(libstdcxx) +endif + +GCC_INCLUDE:=${word 1,${dir $(LIBGCC)}}/include COMPILE_CXX:=$(CC) $c -nostdinc++ $(ALL_CXXFLAGS) -I$(GCC_INCLUDE) \ -fno-rtti -fno-exceptions -- cgit v1.1