diff options
| author | Christopher Faylor <me@cgf.cx> | 2001-10-12 16:52:05 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2001-10-12 16:52:05 +0400 |
| commit | 0055a6c6c9490b37db0c66f6d0681894953971b4 (patch) | |
| tree | 24f01c1792a4406fa2b49e5438fcdb1f13850dc2 /winsup/Makefile.common | |
| parent | c5e7ccacff0e62ed1fc05ce9b47e3b99c47b8705 (diff) | |
* Makefile.common: Perform more include file testing trickery.
Diffstat (limited to 'winsup/Makefile.common')
| -rw-r--r-- | winsup/Makefile.common | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/winsup/Makefile.common b/winsup/Makefile.common index 700b6f00f..49c515991 100644 --- a/winsup/Makefile.common +++ b/winsup/Makefile.common @@ -66,16 +66,20 @@ mingw_build:=$(bupdir)/mingw mingw_source:=$(updir)/mingw utils_build:=$(bupdir)/utils utils_source:=$(updir)/utils -ifeq (,${findstring $(newlib_source),$(CFLAGS) $(CXXFLAGS) $(CXX) $(CC)}) +ifeq (,${findstring $(newlib_source)/libc/include,$(CFLAGS) $(CXXFLAGS) $(CXX) $(CC)}) newlib_include:=-I$(newlib_source)/libc/include -newlib_sys_include:=-I$(newlib_source)/libc/sys +endif +ifeq (,${findstring $(newlib_source)/libc/sys/cygwin,$(CFLAGS) $(CXXFLAGS) $(CXX) $(CC)}) +newlib_sys_include:=-I$(newlib_source)/libc/sys/cygwin +endif +ifeq (,${findstring $(newlib_source)/libc/sys/cygwin/include,$(CFLAGS) $(CXXFLAGS) $(CXX) $(CC)}) +newlib_sys_include_include:=-I$(newlib_source)/libc/sys/cygwin/include endif ifeq (,${findstring $(cygwin_source)/include,$(CFLAGS) $(CXXFLAGS) $(CXX) $(CC)}) cygwin_include:=-I$(cygwin_source)/include endif -cygwin_include:=-I$(cygwin_source)/include -INCLUDES:=-I. $(cygwin_include) -I$(cygwin_source) $(newlib_sys_include) $(newlib_include) $(w32api_include) +INCLUDES:=-I. $(cygwin_include) -I$(cygwin_source) $(newlib_sys_include) $(newlib_include) $(newlib_sys_include_include) $(w32api_include) ifdef CONFIG_DIR INCLUDES+=-I$(CONFIG_DIR) endif |