From eeb65b9513d88ae69f884d6b49976f8819810544 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Mon, 17 Mar 2003 23:13:26 +0000 Subject: [PATCH] * Makefile.common (w32api_lib): Default to system w32api directory if w32api is missing from source. --- winsup/ChangeLog | 5 +++++ winsup/Makefile.common | 3 +++ 2 files changed, 8 insertions(+) diff --git a/winsup/ChangeLog b/winsup/ChangeLog index eb079134e..798f200a7 100644 --- a/winsup/ChangeLog +++ b/winsup/ChangeLog @@ -1,3 +1,8 @@ +2003-03-17 Christopher Faylor + + * Makefile.common (w32api_lib): Default to system w32api directory if + w32api is missing from source. + 2003-03-17 Christopher Faylor * Makefile.common: Fix typo from previous checkin. diff --git a/winsup/Makefile.common b/winsup/Makefile.common index 950803d60..33629c00a 100644 --- a/winsup/Makefile.common +++ b/winsup/Makefile.common @@ -119,6 +119,9 @@ GCC_INCLUDE:=${subst //,/,-I$(gcc_libdir)/include} endif nostdinc:=${shell [ -d "$(updir)/w32api" ] && echo "-nostdinc -nostdinc++"} +ifeq (,$(nostdinc)) +override w32api_lib:=${subst //,/,${shell $(CC) -print-search-dirs | awk -F: '/^librar/{for (i = 1; i <= NF; i++) if ($$i ~ /\/lib\/*$$/) print $$i}'}/w32api} +endif COMPILE_CXX=$(CXX) $c $(nostdinc) $(ALL_CXXFLAGS) $(GCC_INCLUDE) \ -fno-rtti -fno-exceptions