[librsvg: 1/2] Remove __clzsi2 workaround



commit 41626931b9bcc8aee5a71a735670909f70e102ac
Author: Kleis Auke Wolthuizen <github kleisauke nl>
Date:   Tue Dec 10 12:01:46 2019 +0100

    Remove __clzsi2 workaround
    
    Our minimum Rust version is 1.36, this workaround (introduced in e310e36)
    was only necessary for Rust 1.34 and 1.35.

 Makefile.am  | 3 ---
 configure.ac | 2 --
 2 files changed, 5 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 4c93fba3..3635be99 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -198,9 +198,6 @@ librsvg_c_api.la: $(librsvg_c_api_la_OBJECTS) $(LIBRSVG_INTERNALS_SRC) $(LIBRSVG
        PKG_CONFIG='$(PKG_CONFIG)'                                              \
        CARGO_TARGET_DIR=$(CARGO_TARGET_DIR)                                    \
        $(CARGO) --locked build $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS) \
-       && if [[ $$($(NM) -g $(RUST_LIB) | grep "T __*clzsi2" -c) -gt 1 ]] ; then \
-               $(AR) d $(RUST_LIB) clzsi2.o;                                   \
-       fi \
        && cd $(LIBRSVG_BUILD_DIR) && $(LINK) $< && mv $(RUST_LIB) .libs/librsvg_c_api.a
 
 librsvg_@RSVG_API_MAJOR_VERSION@_la_CPPFLAGS = \
diff --git a/configure.ac b/configure.ac
index 784a7ce7..b6dadbd0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -109,8 +109,6 @@ AC_CHECK_PROGS(RUSTC, [rustc], [no])
 AS_IF(test x$RUSTC = xno,
     AC_MSG_ERROR([rustc is required.  Please install the Rust toolchain from https://www.rust-lang.org/])
 )
-AC_CHECK_PROGS(AR, ar)
-AC_CHECK_PROGS(NM, nm)
 
 dnl Minimum version of rustc that we support
 dnl If you change this, please update COMPILING.md


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]