diff options
author | Christopher Faylor <me@cgf.cx> | 2003-03-17 22:27:07 +0000 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2003-03-17 22:27:07 +0000 |
commit | 237ab58c28fc029b71ef1eb795081f7f106a4455 (patch) | |
tree | 7705dccd2a00d6dbb4b31c0a35759013f381d28e /winsup/Makefile.common | |
parent | c51dc9c24578a191e3b2ba7b1d52e93d44d933d5 (diff) | |
download | cygnal-237ab58c28fc029b71ef1eb795081f7f106a4455.tar.gz cygnal-237ab58c28fc029b71ef1eb795081f7f106a4455.tar.bz2 cygnal-237ab58c28fc029b71ef1eb795081f7f106a4455.zip |
* configure.in: w32api directory was already optional. Semi-revert 2003-02-06
change.
* configure: Regenerate.
* Makefile.common: Don't specific -nostdinc if there is no w32api directory.
Diffstat (limited to 'winsup/Makefile.common')
-rw-r--r-- | winsup/Makefile.common | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/winsup/Makefile.common b/winsup/Makefile.common index c98239ffb..b0cf6dfa6 100644 --- a/winsup/Makefile.common +++ b/winsup/Makefile.common @@ -118,9 +118,11 @@ ifeq (,${findstring $(gcc_libdir),$(CFLAGS) $(CXXFLAGS) $(CXX) $(CC)}) GCC_INCLUDE:=${subst //,/,-I$(gcc_libdir)/include} endif -COMPILE_CXX=$(CXX) $c -nostdinc++ -nostdinc $(ALL_CXXFLAGS) $(GCC_INCLUDE) \ +nostdinc:=${shell [ -d "$$srcdir/w32api" ] && echo "-nostdinc -nostdinc++"]} + +COMPILE_CXX=$(CXX) $c $(nostdinc) $(ALL_CXXFLAGS) $(GCC_INCLUDE) \ -fno-rtti -fno-exceptions -COMPILE_CC=$(CC) $c -nostdinc $(ALL_CFLAGS) $(GCC_INCLUDE) +COMPILE_CC=$(CC) $c $(nostdinc) $(ALL_CFLAGS) $(GCC_INCLUDE) vpath %.a $(cygwin_build):$(w32api_lib):$(newlib_build)/libc:$(newlib_build)/libm |