From f846b32d3164628aac718e7eac7db718fc2b6dff Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 14 Dec 2015 19:24:53 +0800 Subject: uses gcc linker for core --- core/plat/linux/prefix.mak | 2 +- core/plat/mac/prefix.mak | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/plat/linux/prefix.mak b/core/plat/linux/prefix.mak index 830305daa..aa94a515f 100755 --- a/core/plat/linux/prefix.mak +++ b/core/plat/linux/prefix.mak @@ -24,7 +24,7 @@ CC_ := $(if $(findstring y,$(PROF)),gcc,$(CC_)) CC = $(PRE_)$(CC_) # ld -LD_ := ${shell if [ -f "/usr/bin/clang++" ]; then echo "clang++"; elif [ -f "/usr/local/bin/clang++" ]; then echo "clang++"; else echo "g++"; fi } +LD_ := ${shell if [ -f "/usr/bin/clang" ]; then echo "clang"; elif [ -f "/usr/local/bin/clang" ]; then echo "clang"; else echo "gcc"; fi } LD_ := $(if $(findstring y,$(PROF)),g++,$(LD_)) LD = $(PRE_)$(LD_) diff --git a/core/plat/mac/prefix.mak b/core/plat/mac/prefix.mak index e3675eec6..caf7aa9a2 100755 --- a/core/plat/mac/prefix.mak +++ b/core/plat/mac/prefix.mak @@ -32,7 +32,7 @@ export CXFLAGS_CHECK endif # ld -LD = $(PRE_)clang++ +LD = $(PRE_)clang ifeq ($(LDFLAGS_CHECK),) LD_CHECK = ${shell if $(LD) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi } LDFLAGS_CHECK := $(call LD_CHECK,-ftrapv,) $(call LD_CHECK,-fsanitize=address,) -- cgit v1.3.1