[librsvg: 3/4] Remove LIB_NAME_WORKAROUND, not needed anymore
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 3/4] Remove LIB_NAME_WORKAROUND, not needed anymore
- Date: Sat, 11 Sep 2021 00:23:37 +0000 (UTC)
commit 6b564e2c2ba9458db491cc6c66a1e5b46eb9ec8e
Author: Ismael Luceno <ismael iodev co uk>
Date: Sat Aug 28 18:19:18 2021 +0200
Remove LIB_NAME_WORKAROUND, not needed anymore
Required rustc version is already >= 1.44.
Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/581>
Makefile.am | 6 ------
configure.ac | 1 -
2 files changed, 7 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 3494780e..e93714e4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -149,13 +149,7 @@ cargo_verbose_1 = --verbose
LIBRSVG_BUILD_DIR=@abs_top_builddir@
CARGO_TARGET_DIR=$(LIBRSVG_BUILD_DIR)/target
-if LIB_NAME_WORKAROUND
-# Workaround for https://github.com/rust-lang/rust/issues/69904
-# can be removed when our minimum Rust version is at least 1.44.
-RUST_LIB=$(CARGO_TARGET_DIR)/$(RUST_TARGET_SUBDIR)/liblibrsvg.lib
-else
RUST_LIB=$(CARGO_TARGET_DIR)/$(RUST_TARGET_SUBDIR)/liblibrsvg.a
-endif
check-local:
cd $(srcdir) && \
diff --git a/configure.ac b/configure.ac
index 6ec8b72a..3fc9fefd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -125,7 +125,6 @@ case "$host" in
esac
AC_MSG_RESULT([$platform_win32])
AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
-AM_CONDITIONAL(LIB_NAME_WORKAROUND, test "$platform_win32" = "yes" -a \( "$major" -lt 1 -o "$minor" -lt 44
\))
AC_MSG_CHECKING([for native Win32])
case "$host" in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]