Skip to content

Commit

Permalink
Merge pull request #34572 from CleverRaven/makefile-osxcross-ncurses
Browse files Browse the repository at this point in the history
Fix cross-compiling for OSX
  • Loading branch information
ZhilkinSerg authored Oct 9, 2019
2 parents 5c88f74 + 131b7ea commit bc7e9e6
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -589,12 +589,14 @@ else
# ONLY when not cross-compiling, check for pkg-config or ncurses5-config
# When doing a cross-compile, we can't rely on the host machine's -configs
ifeq ($(CROSS),)
ifneq ($(shell pkg-config --libs $(NCURSES_PREFIX) 2>/dev/null),)
HAVE_PKGCONFIG = 1
endif
ifneq ($(shell which $(NCURSES_PREFIX)5-config 2>/dev/null),)
HAVE_NCURSES5CONFIG = 1
endif
ifeq ($(OSXCROSS),)
ifneq ($(shell pkg-config --libs $(NCURSES_PREFIX) 2>/dev/null),)
HAVE_PKGCONFIG = 1
endif
ifneq ($(shell which $(NCURSES_PREFIX)5-config 2>/dev/null),)
HAVE_NCURSES5CONFIG = 1
endif
endif
endif

# Link to ncurses if we're using a non-tiles, Linux build
Expand Down

0 comments on commit bc7e9e6

Please sign in to comment.