diff options
| author | Christopher Faylor <me@cgf.cx> | 2003-03-18 02:13:26 +0300 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2003-03-18 02:13:26 +0300 |
| commit | eeb65b9513d88ae69f884d6b49976f8819810544 (patch) | |
| tree | 36b7a88218e907c8904a5d4823554696fad42829 /winsup | |
| parent | 259db8923868916a441bb15d28e566e054db9bea (diff) | |
* Makefile.common (w32api_lib): Default to system w32api directory if w32api is
missing from source.
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/Makefile.common | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/winsup/ChangeLog b/winsup/ChangeLog index eb079134e..798f200a7 100644 --- a/winsup/ChangeLog +++ b/winsup/ChangeLog @@ -1,5 +1,10 @@ 2003-03-17 Christopher Faylor <cgf@redhat.com> + * Makefile.common (w32api_lib): Default to system w32api directory if + w32api is missing from source. + +2003-03-17 Christopher Faylor <cgf@redhat.com> + * Makefile.common: Fix typo from previous checkin. 2003-03-17 Christopher Faylor <cgf@redhat.com> 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 |