arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use 'command -v' to test for ld.gold

pull/548/merge
Jeffrey Walton 2018-01-02 01:13:59 -05:00
parent 58726498f1
commit 1a7f19cdde
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GNUmakefile
View File

@ -21,7 +21,6 @@ CHMOD ?= chmod
MKDIR ?= mkdir MKDIR ?= mkdir
LN ?= ln -sf LN ?= ln -sf
LDCONF ?= /sbin/ldconfig -n LDCONF ?= /sbin/ldconfig -n
UNAME := $(shell uname)
# Solaris provides a non-Posix shell at /usr/bin # Solaris provides a non-Posix shell at /usr/bin
ifneq ($(wildcard /usr/xpg4/bin),) ifneq ($(wildcard /usr/xpg4/bin),)
@ -593,7 +592,8 @@ endif # Asan
# LD gold linker testing. Triggered by 'LD=ld.gold'. # LD gold linker testing. Triggered by 'LD=ld.gold'.
ifeq ($(findstring ld.gold,$(LD)),ld.gold) ifeq ($(findstring ld.gold,$(LD)),ld.gold)
ifeq ($(findstring -fuse-ld=gold,$(CXXFLAGS)),) ifeq ($(findstring -fuse-ld=gold,$(CXXFLAGS)),)
ELF_FORMAT := $(shell file `which ld.gold` 2>&1 | cut -d":" -f 2 | $(GREP) -i -c "elf") LD_GOLD = $(shell command -v ld.gold)
ELF_FORMAT := $(shell file $(LD_GOLD) 2>&1 | cut -d":" -f 2 | $(GREP) -i -c "elf")
ifneq ($(ELF_FORMAT),0) ifneq ($(ELF_FORMAT),0)
LDFLAGS += -fuse-ld=gold LDFLAGS += -fuse-ld=gold
endif # ELF/ELF64 endif # ELF/ELF64