diff options
| author | Max Ostapenko <m.ostapenko@partner.samsung.com> | 2015-10-22 12:47:17 +0300 |
|---|---|---|
| committer | Maxim Ostapenko <chefmax@gcc.gnu.org> | 2015-10-22 12:47:17 +0300 |
| commit | 692b1131a7cc0c5bfa3137a6489b4ef9715b635e (patch) | |
| tree | b707a17b008e0a523dd80cc5934ebfd02843aad6 /libsanitizer/ubsan/Makefile.in | |
| parent | a8fc25795155d4c4d18c8c5b099748a8178b38f6 (diff) | |
| download | gcc-692b1131a7cc0c5bfa3137a6489b4ef9715b635e.zip gcc-692b1131a7cc0c5bfa3137a6489b4ef9715b635e.tar.gz gcc-692b1131a7cc0c5bfa3137a6489b4ef9715b635e.tar.bz2 | |
Fix bootstrap on x86_64-apple-darwin14 after r229119.
libsanitizer/
PR bootstrap/68041
* configure.ac (link_sanitizer_common): Link against librt only if it
contains shm_open, required by sanitizers.
(CXX_ABI_NEEDED): Remove variable.
* configure: Regenerate.
* ubsan/Makefile.am (libubsan_la_LIBADD): Do not add -lc++abi anymore.
* ubsan/Makefile.in: Regenerate.
From-SVN: r229168
Diffstat (limited to 'libsanitizer/ubsan/Makefile.in')
| -rw-r--r-- | libsanitizer/ubsan/Makefile.in | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libsanitizer/ubsan/Makefile.in b/libsanitizer/ubsan/Makefile.in index 3b5cfbf..51d4da5 100644 --- a/libsanitizer/ubsan/Makefile.in +++ b/libsanitizer/ubsan/Makefile.in @@ -54,7 +54,6 @@ host_triplet = @host@ target_triplet = @target@ @USING_MAC_INTERPOSE_FALSE@am__append_1 = $(top_builddir)/interception/libinterception.la @LIBBACKTRACE_SUPPORTED_TRUE@am__append_2 = $(top_builddir)/libbacktrace/libsanitizer_libbacktrace.la -@USE_CXX_ABI_FLAG_TRUE@am__append_3 = -lc++abi subdir = ubsan DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -107,8 +106,7 @@ LTLIBRARIES = $(toolexeclib_LTLIBRARIES) am__DEPENDENCIES_1 = libubsan_la_DEPENDENCIES = \ $(top_builddir)/sanitizer_common/libsanitizer_common.la \ - $(am__append_1) $(am__append_2) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__append_1) $(am__append_2) $(am__DEPENDENCIES_1) am__objects_1 = ubsan_diag.lo ubsan_flags.lo ubsan_handlers.lo \ ubsan_handlers_cxx.lo ubsan_init.lo ubsan_type_hash.lo \ ubsan_type_hash_itanium.lo ubsan_type_hash_win.lo \ @@ -312,8 +310,7 @@ ubsan_files = \ libubsan_la_SOURCES = $(ubsan_files) libubsan_la_LIBADD = \ $(top_builddir)/sanitizer_common/libsanitizer_common.la \ - $(am__append_1) $(am__append_2) $(LIBSTDCXX_RAW_CXX_LDFLAGS) \ - $(am__append_3) + $(am__append_1) $(am__append_2) $(LIBSTDCXX_RAW_CXX_LDFLAGS) libubsan_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(link_libubsan) # Work around what appears to be a GNU make bug handling MAKEFLAGS |