folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makefile: Generalize HomeBrew dependency checking for MacOS M1 systems

Browse source 
As discussed in #1050
This commit is contained in:
Mark Pizzolato 2021-06-22 03:48:23 -07:00
parent e519c93ebf
commit 492819380f
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
makefile
View file

@ -356,8 +356,8 @@ ifeq (${WIN32},) #*nix Environments (&& cygwin)
else else
HBPATH = /opt/homebrew HBPATH = /opt/homebrew
endif endif
INCPATH += $(foreach dir,$(wildcard $(HBPATH)/Cellar/*/*),$(dir)/include) INCPATH += $(foreach dir,$(wildcard $(HBPATH)/Cellar/*/*),$(realpath $(dir)/include))
LIBPATH += $(foreach dir,$(wildcard $(HBPATH)/Cellar/*/*),$(dir)/lib) LIBPATH += $(foreach dir,$(wildcard $(HBPATH)/Cellar/*/*),$(realpath $(dir)/lib))
endif endif
else else
ifeq (Linux,$(OSTYPE)) ifeq (Linux,$(OSTYPE))
@ -492,6 +492,8 @@ ifeq (${WIN32},) #*nix Environments (&& cygwin)
LIBPATH += /usr/lib/ LIBPATH += /usr/lib/
endif endif
endif endif
export CPATH = $(subst $() $(),:,$(INCPATH))
export LIBRARY_PATH = $(subst $() $(),:,$(LIBPATH))
# Some gcc versions don't support LTO, so only use LTO when the compiler is known to support it # Some gcc versions don't support LTO, so only use LTO when the compiler is known to support it
ifeq (,$(NO_LTO)) ifeq (,$(NO_LTO))
ifneq (,$(GCC_VERSION)) ifneq (,$(GCC_VERSION))