* Makefile.in: eliminate the need for RUNTIME and CRT_ID.
Always build crt1.o, dllcrt1.o, crt2.o and dllcrt2.o. Create a libcoldname.a for the oldname library for CRTDLL. Restrict libmoldname.a for the oldname library for MSVCRT. * configure.in: eliminate setting RUNTIME and CRT_ID variables. Restructure the $target_os case logic. Always name the MinGW thread dll helper mingwm. Change Cygwin's HEADER_SUBDIR value from mingw32 to mingw. * configure: regenerate.
This commit is contained in:
34
winsup/mingw/configure
vendored
34
winsup/mingw/configure
vendored
@@ -1665,35 +1665,20 @@ SUBDIRS=""
|
||||
HEADER_SUBDIR=""
|
||||
|
||||
case "$target_os" in
|
||||
*mingw32msvc*)
|
||||
CRT_ID=2
|
||||
MNO_CYGWIN=
|
||||
RUNTIME=msvcrt
|
||||
THREAD_DLL=mingwm
|
||||
LIBM_A=libm.a
|
||||
LIBGMON_A=libgmon.a
|
||||
SUBDIRS="profile"
|
||||
configdirs="$configdirs profile"
|
||||
;;
|
||||
*cygwin*)
|
||||
CRT_ID=1
|
||||
MNO_CYGWIN=-mno-cygwin
|
||||
RUNTIME=crtdll
|
||||
THREAD_DLL=mingwc
|
||||
configdirs="$configdirs"
|
||||
# FIXME MinGW versions of libm.a and libgmon.a needed for -mno-cygwin
|
||||
# Do not build libm.a when building under Cygwin winsup. Otherwise, it'll
|
||||
# overwrite Cygwin's one. Likewise for libgmon.a.
|
||||
LIBM_A=
|
||||
LIBGMON_A=
|
||||
# Install mingw headers in mingw subdirectory.
|
||||
HEADER_SUBDIR="mingw32"
|
||||
HEADER_SUBDIR="mingw"
|
||||
;;
|
||||
*)
|
||||
# Build it for CRTDLL by default.
|
||||
CRT_ID=1
|
||||
# Build it for MSVCRT by default.
|
||||
MNO_CYGWIN=
|
||||
RUNTIME=crtdll
|
||||
THREAD_DLL=mingwc
|
||||
LIBM_A=libm.a
|
||||
LIBGMON_A=libgmon.a
|
||||
SUBDIRS="profile"
|
||||
@@ -1701,6 +1686,13 @@ case "$target_os" in
|
||||
;;
|
||||
esac
|
||||
|
||||
# THREAD_DLL used to be set within the above case and was mingwc for CRTDLL.
|
||||
# I can find no reason to do this.
|
||||
#
|
||||
# FIXME: In the future I would like to change the dll name to mingwthrd to
|
||||
# to match the libmingwthrd.a name.
|
||||
THREAD_DLL=mingwm
|
||||
|
||||
if test -n "$configdirs"; then
|
||||
subdirs="$configdirs"
|
||||
|
||||
@@ -1715,8 +1707,6 @@ MKINSTALLDIRS=$ac_aux_dir/mkinstalldirs
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# Find a good install program. We prefer a C program (faster),
|
||||
# so one script is as good as another. But avoid the broken or
|
||||
# incompatible versions:
|
||||
@@ -1729,7 +1719,7 @@ MKINSTALLDIRS=$ac_aux_dir/mkinstalldirs
|
||||
# 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:1733: checking for a BSD compatible install" >&5
|
||||
echo "configure:1723: 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
|
||||
@@ -1955,8 +1945,6 @@ s%@target_vendor@%$target_vendor%g
|
||||
s%@target_os@%$target_os%g
|
||||
s%@subdirs@%$subdirs%g
|
||||
s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g
|
||||
s%@CRT_ID@%$CRT_ID%g
|
||||
s%@RUNTIME@%$RUNTIME%g
|
||||
s%@MNO_CYGWIN@%$MNO_CYGWIN%g
|
||||
s%@THREAD_DLL@%$THREAD_DLL%g
|
||||
s%@LIBM_A@%$LIBM_A%g
|
||||
|
Reference in New Issue
Block a user