From 01859fc441c2f253f258bbe13de1e77ba2ffe8bd Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 12 May 2003 11:06:00 +0000 Subject: [PATCH] * Makefile.common: Remove newlib_sys_include and newlib_sys_include_include entirely. Set CRT0 to cygwin/crt0.o. --- winsup/ChangeLog | 5 +++++ winsup/Makefile.common | 10 ++-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/winsup/ChangeLog b/winsup/ChangeLog index 6cd29feba..9f9c5caa5 100644 --- a/winsup/ChangeLog +++ b/winsup/ChangeLog @@ -1,3 +1,8 @@ +2003-05-12 Corinna Vinschen + + * Makefile.common: Remove newlib_sys_include and + newlib_sys_include_include entirely. Set CRT0 to cygwin/crt0.o. + 2003-04-18 Christopher Faylor * Makefile.in: Reorganize to try to allow lack of mingw/w32api to work. diff --git a/winsup/Makefile.common b/winsup/Makefile.common index 97812f9af..954c8477c 100644 --- a/winsup/Makefile.common +++ b/winsup/Makefile.common @@ -70,12 +70,6 @@ utils_source:=$(updir)/utils ifeq (,${findstring $(newlib_source)/libc/include,$(CFLAGS) $(CXXFLAGS) $(CXX) $(CC)}) newlib_include:=-I$(newlib_source)/libc/include 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 @@ -102,7 +96,7 @@ ifeq (,${nostdlib}) nostdinc:= endif -INCLUDES:=-I. $(cygwin_include) -I$(cygwin_source) $(newlib_sys_include) $(newlib_include) $(newlib_sys_include_include) $(w32api_include) +INCLUDES:=-I. $(cygwin_include) -I$(cygwin_source) $(newlib_include) $(w32api_include) ifdef CONFIG_DIR INCLUDES+=-I$(CONFIG_DIR) endif @@ -118,7 +112,7 @@ GCC_DEFAULT_OPTIONS:=$(CFLAGS_COMMON) $(CFLAGS_CONFIG) $(INCLUDES) LIBC:=$(newlib_build)/libc/libc.a LIBM:=$(newlib_build)/libm/libm.a -CRT0:=$(newlib_build)/libc/crt0.o +CRT0:=$(cygwin_build)/crt0.o ALL_CFLAGS:=$(DEFS) $(MALLOC_DEBUG) $(CFLAGS) $(GCC_DEFAULT_OPTIONS) ALL_CXXFLAGS=$(DEFS) $(MALLOC_DEBUG) $(CXXFLAGS) $(GCC_DEFAULT_OPTIONS)