* Makefile.common (w32api_lib): Fix w32api detection.

This commit is contained in:
Christopher Faylor 2003-04-11 21:48:39 +00:00
parent 000cfc2eb2
commit 770ff5bcb4
2 changed files with 6 additions and 2 deletions

View File

@ -1,3 +1,7 @@
2003-04-11 Christopher Faylor <cgf@redhat.com>
* Makefile.common (w32api_lib): Fix w32api detection.
2003-03-28 Christopher Faylor <cgf@redhat.com> 2003-03-28 Christopher Faylor <cgf@redhat.com>
* Makefile.common (ALL_CXXFLAGS): Make normal '=' type variable so that * Makefile.common (ALL_CXXFLAGS): Make normal '=' type variable so that

View File

@ -10,7 +10,7 @@
# This makefile requires GNU make. # This makefile requires GNU make.
CFLAGS_COMMON:=-Wall -Wwrite-strings -fno-common -pipe -Winline -fbuiltin -fmessage-length=0# -finline-functions CFLAGS_COMMON:=-march=i386 -Wall -Wwrite-strings -fno-common -pipe -Winline -fbuiltin -fmessage-length=0# -finline-functions
MALLOC_DEBUG:=#-DMALLOC_DEBUG -I/cygnus/src/uberbaum/winsup/cygwin/dlmalloc MALLOC_DEBUG:=#-DMALLOC_DEBUG -I/cygnus/src/uberbaum/winsup/cygwin/dlmalloc
MALLOC_OBJ:=#/cygnus/src/uberbaum/winsup/cygwin/dlmalloc/malloc.o MALLOC_OBJ:=#/cygnus/src/uberbaum/winsup/cygwin/dlmalloc/malloc.o
@ -120,7 +120,7 @@ endif
nostdinc:=${shell [ -d "$(updir)/w32api" ] && echo "-nostdinc -nostdinc++"} nostdinc:=${shell [ -d "$(updir)/w32api" ] && echo "-nostdinc -nostdinc++"}
ifeq (,$(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} override w32api_lib:=${subst //,/,${shell $(CC) -print-search-dirs | awk -F: '/^librar/{for (i = 1; i <= NF; i++) if ($$i ~ /\/lib\/*$$/) foo=$$i} END{print foo}'}/w32api}
endif endif
COMPILE_CXX=$(CXX) $c $(nostdinc) $(ALL_CXXFLAGS) $(GCC_INCLUDE) \ COMPILE_CXX=$(CXX) $c $(nostdinc) $(ALL_CXXFLAGS) $(GCC_INCLUDE) \