diff options
author | Earnie Boyd <earnie@users.sf.net> | 2003-05-06 17:26:44 +0400 |
---|---|---|
committer | Earnie Boyd <earnie@users.sf.net> | 2003-05-06 17:26:44 +0400 |
commit | 42fbaad1e8c9f26bd92ddbb3248cc8bfd03db173 (patch) | |
tree | 83dd250a5952a0e50d3dd912269eeafb6bef22b3 /winsup/mingw/profile/Makefile.in | |
parent | af70a0ea40ac29f809b2efb1d5ec5e960219cbb6 (diff) |
* configure.in (CFLAGS): Remove -D__USE_CRTIMP=1 due to possibilites
of multiply defined symbols if the symbols is defined locally. E.G.:
A local definition of malloc causes this problem.
* configure: Regenerate.
* profile/Makefile.in (W32API_INCLUDE): New variable.
(ALL_CFLAGS): Use W32API_INCLUDE value.
(ALL_CXXFLAGS): Ditto.
(gcrt0.o gcrt1.o gcrt2.o): Use ALL_CFLAGS instead of CFLAGS.
Thanks to Jeff Bonggren <jbon@users.sf.net>.
* profile/configure.in (W32API_INCLUDE): Set default value.
* profile/configure: Regenerate.
* mingwex/Makefile.in (W32API_INCLUDE): New variable.
(ALL_CFLAGS): Use W32API-INCLUDE value.
(ALL_CXXFLAGS): Ditto.
* mingwex/configure.in (W32API_INCLUDE): Set default value.
* mingwex/configure: Regenerate.
Diffstat (limited to 'winsup/mingw/profile/Makefile.in')
-rw-r--r-- | winsup/mingw/profile/Makefile.in | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/winsup/mingw/profile/Makefile.in b/winsup/mingw/profile/Makefile.in index aca3a2950..d6038d591 100644 --- a/winsup/mingw/profile/Makefile.in +++ b/winsup/mingw/profile/Makefile.in @@ -47,12 +47,12 @@ THREAD_DLL = @THREAD_DLL@ THREAD_DLL_VERSION = 10 THREAD_DLL_NAME = $(THREAD_DLL)$(THREAD_DLL_VERSION).dll +W32API_INCLUDE = @W32API_INCLUDE@ INCLUDES = -I$(srcdir) -I$(srcdir)/../include \ - -I$(srcdir)/../../w32api/include \ -nostdinc -nostdinc++ \ -iwithprefixbefore include -ALL_CFLAGS = $(CFLAGS) $(INCLUDES) $(MNO_CYGWIN) -ALL_CXXFLAGS = $(CXXFLAGS) $(INCLUDES) $(MNO_CYGWIN) +ALL_CFLAGS = $(CFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN) +ALL_CXXFLAGS = $(CXXFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN) AS = @AS@ AR = @AR@ @@ -81,13 +81,13 @@ $(LIBGMON_A): $(LIBGMON_OBJS) $(CRT0S) # FIXME: These are really the same, but gcc specs want different names. # The only CRT dependency is atexit. gcrt0.o: gcrt0.c - $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $? + $(CC) -c -o $@ $(CPPFLAGS) $(ALL_CFLAGS) $? gcrt1.o: gcrt0.c - $(CC) -U__MSVCRT__ -c -o $@ $(CPPFLAGS) $(CFLAGS) $? + $(CC) -U__MSVCRT__ -c -o $@ $(CPPFLAGS) $(ALL_CFLAGS) $? gcrt2.o: gcrt0.c - $(CC) -D__MSVCRT__ -c -o $@ $(CPPFLAGS) $(CFLAGS) $? + $(CC) -D__MSVCRT__ -c -o $@ $(CPPFLAGS) $(ALL_CFLAGS) $? # # Dependancies |