Skip to content

Commit

Permalink
Merge bitcoin#17676: depends: don't use OpenGL in Qt on macOS
Browse files Browse the repository at this point in the history
2359a47 depends: don't use OpenGL in Qt on macOS (fanquake)
ba0cad2 build: pass -dead_strip_dylibs to ld on macOS (fanquake)

Pull request description:

  Based on bitcoin#17663. OpenGL on macOS was also deprecated in 10.14.

  This also removes the `/System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL` dylib from `bitcoin-qt`.

ACKs for top commit:
  laanwj:
    ACK 2359a47
  jonasschnelli:
    utACK 2359a47
  hebasto:
    ACK 2359a47

Tree-SHA512: 39b0151832c829f6ebdc4910eb28ebbeba64539cd04eba6ce3ec75fc0f231569956ca51a1e0bffc76dd27e85643c65a155320b9b450c49e9841e12b108406d41
  • Loading branch information
laanwj authored and sidhujag committed Dec 9, 2019
1 parent b612ecd commit 02db4da
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions depends/packages/qt.mk
Expand Up @@ -105,6 +105,7 @@ $(package)_config_opts += -no-feature-wizard
$(package)_config_opts += -no-feature-xml

$(package)_config_opts_darwin = -no-dbus
$(package)_config_opts_darwin += -no-opengl

ifneq ($(build_os),darwin)
$(package)_config_opts_darwin += -xplatform macx-clang-linux
Expand Down

0 comments on commit 02db4da

Please sign in to comment.