Merge pull request #56561 from dtzWill/feature/qtbase-gold-linker-is-okay

qtbase: let build use gold linker if it wants, maybe works now
This commit is contained in:
Will Dietz 2019-03-01 10:39:02 -06:00 committed by GitHub
commit e30d887597
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -301,7 +301,6 @@ stdenv.mkDerivation {
then
[
"-platform macx-clang"
"-no-use-gold-linker"
"-no-fontconfig"
"-qt-freetype"
"-qt-libpng"
@ -329,9 +328,6 @@ stdenv.mkDerivation {
"-glib"
"-system-libjpeg"
"-system-libpng"
# gold linker of binutils 2.28 generates duplicate symbols
# TODO: remove for newer version of binutils
"-no-use-gold-linker"
]
++ lib.optional withGtk3 "-gtk"
++ lib.optional (compareVersion "5.9.0" >= 0) "-inotify"