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

makefile: Add link library path (-L) when needed on platforms which don't readily locate the PCRE library

Browse source
This commit is contained in:
Mark Pizzolato 2014-11-11 11:45:39 -08:00
parent a0c7f99a5e
commit d2079ab482
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
makefile
View file

@ -293,6 +293,8 @@ ifeq ($(WIN32),) #*nix Environments (&& cygwin)
$(info include paths are: $(INCPATH)) $(info include paths are: $(INCPATH))
find_lib = $(strip $(firstword $(foreach dir,$(strip $(LIBPATH)),$(wildcard $(dir)/lib$(1).$(LIBEXT))))) find_lib = $(strip $(firstword $(foreach dir,$(strip $(LIBPATH)),$(wildcard $(dir)/lib$(1).$(LIBEXT)))))
find_include = $(strip $(firstword $(foreach dir,$(strip $(INCPATH)),$(wildcard $(dir)/$(1).h)))) find_include = $(strip $(firstword $(foreach dir,$(strip $(INCPATH)),$(wildcard $(dir)/$(1).h))))
need_search = $(strip $(shell ld -l$(1) /dev/null 2>&1 | grep $(1) | sed s/$(1)//))
LD_SEARCH_NEEDED := $(call need_search,ZzzzzzzZ)
ifneq (,$(call find_lib,m)) ifneq (,$(call find_lib,m))
OS_LDFLAGS += -lm OS_LDFLAGS += -lm
$(info using libm: $(call find_lib,m)) $(info using libm: $(call find_lib,m))
@ -337,6 +339,9 @@ ifeq ($(WIN32),) #*nix Environments (&& cygwin)
OS_CCDEFS += -DHAVE_PCREPOSIX_H OS_CCDEFS += -DHAVE_PCREPOSIX_H
OS_LDFLAGS += -lpcreposix OS_LDFLAGS += -lpcreposix
$(info using libpcreposix: $(call find_lib,pcreposix) $(call find_include,pcreposix)) $(info using libpcreposix: $(call find_lib,pcreposix) $(call find_include,pcreposix))
ifeq ($(LD_SEARCH_NEEDED),$(call need_search,pcreposix))
OS_LDFLAGS += -L$(dir $(call find_lib,pcreposix))
endif
endif endif
else else
# If libpcreposix isn't available, fall back to the local regex.h # If libpcreposix isn't available, fall back to the local regex.h