* Makefile.in: Use a different method to invoke gcc in a cygwin-hosted

environment.
* mingwex/Makefile.in: Ditto.
* profile/Makefile.in: Ditto.
* configure.in: Record mingw front-end for building under Cygwin.
* mingwex/configure.in: Ditto.
* profile/configure.in: Ditto.
* configure: Regenerate.
* mingwex/configure: Ditto.
* profile/configure: Ditto.
This commit is contained in:
Christopher Faylor
2008-10-12 23:58:17 +00:00
parent 391f2a8eed
commit a7844a1841
10 changed files with 6426 additions and 4040 deletions

View File

@@ -36,7 +36,10 @@ CFLAGS = @CFLAGS@
CXXFLAGS = @CXXFLAGS@
# compiling with Cygwin?
MNO_CYGWIN = @MNO_CYGWIN@
NO_CYGWIN := @NO_CYGWIN@
ifdef NO_CYGWIN
override CC := ${NO_CYGWIN} $(firstword $(filter-out ${NO_CYGWIN},${CC}))
endif
# Either crtdll (CRT_ID 1) or msvcrt (CRT_ID 2).
RUNTIME = @RUNTIME@
@@ -51,8 +54,8 @@ W32API_INCLUDE = @W32API_INCLUDE@
INCLUDES = -I$(srcdir) -I$(srcdir)/../include \
-nostdinc \
-iwithprefixbefore include
ALL_CFLAGS = $(CFLAGS) $(INCLUDES) $(W32API_INCLUDE) $(MNO_CYGWIN)
ALL_CXXFLAGS = $(CXXFLAGS) $(INCLUDES) -nostdinc++ $(W32API_INCLUDE) $(MNO_CYGWIN)
ALL_CFLAGS = $(CFLAGS) $(INCLUDES) $(W32API_INCLUDE)
ALL_CXXFLAGS = $(CXXFLAGS) $(INCLUDES) -nostdinc++ $(W32API_INCLUDE)
AS = @AS@
AR = @AR@

File diff suppressed because it is too large Load Diff

View File

@@ -40,13 +40,13 @@ LIBGMON_A=libgmon.a
case "$target_os" in
*mingw32crt*)
CRT_ID=1
MNO_CYGWIN=
NO_CYGWIN=
RUNTIME=crtdll
CRT0S="gcrt1.o gcrt2.o"
;;
*cygwin*)
CRT_ID=2
MNO_CYGWIN=-mno-cygwin
NO_CYGWIN="$(cd ${srcdir}/../../utils; pwd)/mingw"
RUNTIME=msvcrt
CRT0S=gcrt0.o
# Do not build libm.a when building under Cygwin winsup. Otherwise, it'll
@@ -55,7 +55,7 @@ case "$target_os" in
*)
# Build it for MSVCRT by default.
CRT_ID=2
MNO_CYGWIN=
NO_CYGWIN=
RUNTIME=msvcrt
CRT0S="gcrt1.o gcrt2.o"
;;
@@ -65,7 +65,7 @@ W32API_INCLUDE='-I $(srcdir)/../../w32api/include'
AC_SUBST(CRT_ID)
AC_SUBST(RUNTIME)
AC_SUBST(MNO_CYGWIN)
AC_SUBST(NO_CYGWIN)
AC_SUBST(LIBGMON_A)
AC_SUBST(CRT0S)
AC_SUBST(W32API_INCLUDE)