summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIsmael Luceno2021-06-29 19:17:02 +0200
committerIsmael Luceno2021-06-29 19:17:02 +0200
commit7971025f00eadc674d2f1534c3bfd62b0dd0720b (patch)
treecde1c4d3000387aae2e74b45e61420320dffb93d
parent68a8965749cec1c728cdba62d1000c3044643224 (diff)
Revert "schroot: Workaround linking issue with GCC 11 on musl"
This reverts commit d1d28803d19331e6263e90de5320b95dfe08caab.
-rwxr-xr-xutils/schroot/BUILD7
-rw-r--r--utils/schroot/HISTORY3
2 files changed, 0 insertions, 10 deletions
diff --git a/utils/schroot/BUILD b/utils/schroot/BUILD
index 7908f8b49c..4fa6ddb89a 100755
--- a/utils/schroot/BUILD
+++ b/utils/schroot/BUILD
@@ -1,10 +1,3 @@
-# XXX workaround for linking issue with GCC 11
-case "$HOST" in
- (*-musl)
- CXXFLAGS+=' -static-libstdc++'
- ;;
-esac &&
-
OPTS+=' --enable-shared --disable--static' &&
LDFLAGS+=" -lintl" &&
default_build
diff --git a/utils/schroot/HISTORY b/utils/schroot/HISTORY
index df92342b16..c26f399109 100644
--- a/utils/schroot/HISTORY
+++ b/utils/schroot/HISTORY
@@ -1,6 +1,3 @@
-2021-05-05 Ismael Luceno <ismael@sourcemage.org>
- * BUILD: Workaround linking issue with GCC 11 on musl
-
2021-03-08 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: use GETTEXT