Commit 20b11783 by Mark Mitchell

ainclude.m4 (GLIBCPP_CHEC_MATH_DECLS_AND_LINKAGE_1): New macro.

	* ainclude.m4 (GLIBCPP_CHEC_MATH_DECLS_AND_LINKAGE_1): New macro.
	(GLIBCPP_CHECK_MATH_SUPPORT): Use it.
	(GLIBCPP_CHECK_TYPE_SUPPORT): Don't autoconf ctype information if
	its already provided in config.target.
	* aclocal.m4: Regenerated.
	* configure: Likewise.
	* configure.target: Set ctype_include_dir for lots of systems.
	* libsupc++/Makefile.am: Explicitly include --tag disable-shared.
	* libsupc++/Makefile.in: Regenerated.

From-SVN: r39196
parent 27902296
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -77,12 +77,15 @@ case "${target_os}" in ...@@ -77,12 +77,15 @@ case "${target_os}" in
enable_threads='no' enable_threads='no'
;; ;;
esac esac
ctype_include_dir=${os_include_dir}
;; ;;
aix*) aix*)
os_include_dir="config/os/aix" os_include_dir="config/os/aix"
ctype_include_dir=${os_include_dir}
;; ;;
bsd* | freebsd* ) bsd* | freebsd* )
os_include_dir="config/os/bsd/freebsd" os_include_dir="config/os/bsd/freebsd"
ctype_include_dir=${os_include_dir}
;; ;;
cygwin*) cygwin*)
os_include_dir="config/os/newlib" os_include_dir="config/os/newlib"
...@@ -92,21 +95,27 @@ case "${target_os}" in ...@@ -92,21 +95,27 @@ case "${target_os}" in
;; ;;
linux* | gnu*) linux* | gnu*)
os_include_dir="config/os/gnu-linux" os_include_dir="config/os/gnu-linux"
ctype_include_dir=${os_include_dir}
;; ;;
irix*) irix*)
os_include_dir="config/os/irix" os_include_dir="config/os/irix"
ctype_include_dir=${os_include_dir}
;; ;;
netbsd*) netbsd*)
os_include_dir="config/os/bsd/netbsd" os_include_dir="config/os/bsd/netbsd"
ctype_include_dir=${os_include_dir}
;; ;;
solaris2.5*) solaris2.5*)
os_include_dir="config/os/solaris/solaris2.5" os_include_dir="config/os/solaris/solaris2.5"
ctype_include_dir=${os_include_dir}
;; ;;
solaris2.6*) solaris2.6*)
os_include_dir="config/os/solaris/solaris2.6" os_include_dir="config/os/solaris/solaris2.6"
ctype_include_dir=${os_include_dir}
;; ;;
solaris2.7* | solaris2.8*) solaris2.7* | solaris2.8*)
os_include_dir="config/os/solaris/solaris2.7" os_include_dir="config/os/solaris/solaris2.7"
ctype_include_dir=${os_include_dir}
;; ;;
hpux) hpux)
os_include_dir="config/os/hpux" os_include_dir="config/os/hpux"
......
## Makefile for the GNU C++ Support library. ## Makefile for the GNU C++ Support library.
## ##
## Copyright (C) 2000 Free Software Foundation, Inc. ## Copyright (C) 2000, 2001 Free Software Foundation, Inc.
## ##
## Process this file with automake to produce Makefile.in. ## Process this file with automake to produce Makefile.in.
## ##
...@@ -144,8 +144,12 @@ AM_CXXFLAGS = \ ...@@ -144,8 +144,12 @@ AM_CXXFLAGS = \
# can't decide which configuration to use, and it gives up. The # can't decide which configuration to use, and it gives up. The
# correct solution is to add `--tag CXX' to LTCXXCOMPILE and maybe # correct solution is to add `--tag CXX' to LTCXXCOMPILE and maybe
# CXXLINK, just after $(LIBTOOL), so that libtool doesn't have to # CXXLINK, just after $(LIBTOOL), so that libtool doesn't have to
# attempt to infer which configuration to use # attempt to infer which configuration to use.
LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) \ #
# We have to put --tag disable-shared after --tag CXX lest things
# CXX undo the affect of disable-shared.
LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared \
--mode=compile $(CXX) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS)
# 3) We have a problem when building the shared libstdc++ object if # 3) We have a problem when building the shared libstdc++ object if
......
...@@ -195,8 +195,11 @@ AM_CXXFLAGS = -fno-implicit-templates $(LIBSUPCXX_CXXFLAGS) $(WARN_CXXFLAGS) ...@@ -195,8 +195,11 @@ AM_CXXFLAGS = -fno-implicit-templates $(LIBSUPCXX_CXXFLAGS) $(WARN_CXXFLAGS)
# can't decide which configuration to use, and it gives up. The # can't decide which configuration to use, and it gives up. The
# correct solution is to add `--tag CXX' to LTCXXCOMPILE and maybe # correct solution is to add `--tag CXX' to LTCXXCOMPILE and maybe
# CXXLINK, just after $(LIBTOOL), so that libtool doesn't have to # CXXLINK, just after $(LIBTOOL), so that libtool doesn't have to
# attempt to infer which configuration to use # attempt to infer which configuration to use.
LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) #
# We have to put --tag disable-shared after --tag CXX lest things
# CXX undo the affect of disable-shared.
LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared --mode=compile $(CXX) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS)
# 3) We have a problem when building the shared libstdc++ object if # 3) We have a problem when building the shared libstdc++ object if
...@@ -230,7 +233,7 @@ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS ...@@ -230,7 +233,7 @@ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS
CXXLD = $(CXX) CXXLD = $(CXX)
HEADERS = $(glibcppinstall_HEADERS) HEADERS = $(glibcppinstall_HEADERS)
DIST_COMMON = ChangeLog Makefile.am Makefile.in configure configure.in DIST_COMMON = Makefile.am Makefile.in configure configure.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment