* 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.
This commit is contained in:
6
winsup/mingw/profile/configure
vendored
6
winsup/mingw/profile/configure
vendored
@@ -671,6 +671,9 @@ case "$target_os" in
|
||||
;;
|
||||
esac
|
||||
|
||||
W32API_INCLUDE='$(subdir)/../w32api/include'
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -689,7 +692,7 @@ esac
|
||||
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
|
||||
# ./install, which can be erroneously created by make from ./install.sh.
|
||||
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
|
||||
echo "configure:693: checking for a BSD compatible install" >&5
|
||||
echo "configure:696: checking for a BSD compatible install" >&5
|
||||
if test -z "$INSTALL"; then
|
||||
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@@ -913,6 +916,7 @@ s%@RUNTIME@%$RUNTIME%g
|
||||
s%@MNO_CYGWIN@%$MNO_CYGWIN%g
|
||||
s%@LIBGMON_A@%$LIBGMON_A%g
|
||||
s%@CRT0S@%$CRT0S%g
|
||||
s%@W32API_INCLUDE@%$W32API_INCLUDE%g
|
||||
s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
|
||||
s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
|
||||
s%@INSTALL_DATA@%$INSTALL_DATA%g
|
||||
|
Reference in New Issue
Block a user