diff options
| author | H.J. Lu <hongjiu.lu@intel.com> | 2012-12-12 13:40:15 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl@gcc.gnu.org> | 2012-12-12 05:40:15 -0800 |
| commit | e1e953d9d5c28b4153a9229f629c644f8c228fbf (patch) | |
| tree | 29faca1a1f882ad2583abc1e137b8ac20698e8b6 /libjava/configure | |
| parent | a62d3903d92c45b7d20a0f015890552c67f9c228 (diff) | |
| download | gcc-e1e953d9d5c28b4153a9229f629c644f8c228fbf.tar.gz | |
Use libstdc++-raw-cxx.m4 in libjava
config/
* libstdc++-raw-cxx.m4 (GCC_LIBSTDCXX_RAW_CXX_FLAGS): Also
AC_SUBST LIBSTDCXX_RAW_CXX_LDFLAGS.
libjava/
* Makefile.am (lib_gnu_awt_xlib_la_CPPFLAGS): Use
$(LIBSTDCXX_RAW_CXX_CXXLAGS).
(lib_gnu_awt_xlib_la_LDFLAGS): Use $(LIBSTDCXX_RAW_CXX_LDLAGS).
* configure.ac (GCC_LIBSTDCXX_RAW_CXX_FLAGS): New.
* aclocal.m4: Regenerated.
* Makefile.in:Likewise.
* configure: Likewise.
libsanitizer/
* asan/Makefile.am (libasan_la_LIBADD): Use $(LIBSTDCXX_RAW_CXX_LDLAGS).
* tsan/Makefile.am (libtsan_la_LIBADD): Likewise.
* Makefile.in: Regenerated.
* configure: Likewise.
* asan/Makefile.in: Likewise.
* interception/Makefile.in: Likewise.
* sanitizer_common/Makefile.in: Likewise.
* tsan/Makefile.in: Likewise.
From-SVN: r194448
Diffstat (limited to 'libjava/configure')
| -rwxr-xr-x | libjava/configure | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/libjava/configure b/libjava/configure index 53ab75412a8..44acaeb8f69 100755 --- a/libjava/configure +++ b/libjava/configure @@ -856,6 +856,8 @@ CREATE_GJDOC_TRUE ANTLR_JAR mkinstalldirs LN_S +LIBSTDCXX_RAW_CXX_LDFLAGS +LIBSTDCXX_RAW_CXX_CXXFLAGS target_noncanonical target_os target_vendor @@ -3195,6 +3197,20 @@ esac + + + + + LIBSTDCXX_RAW_CXX_CXXFLAGS="\ + -I\$(top_builddir)/../libstdc++-v3/include \ + -I\$(top_builddir)/../libstdc++-v3/include/\$(target_noncanonical) \ + -I\$(top_srcdir)/../libstdc++-v3/libsupc++" + LIBSTDCXX_RAW_CXX_LDFLAGS="\ + -I\$(top_builddir)/../libstdc++-v3/src/libstdc++.la" + + + + # This works around the fact that libtool configuration may change LD # for this particular configuration, but some shells, instead of # keeping the changes in LD private, export them just because LD is @@ -13366,7 +13382,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13369 "configure" +#line 13385 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13472,7 +13488,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13475 "configure" +#line 13491 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19467,7 +19483,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then : enableval=$enable_sjlj_exceptions; : else cat > conftest.$ac_ext << EOF -#line 19470 "configure" +#line 19486 "configure" struct S { ~S(); }; void bar(); void foo() |