summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2015-12-14 19:24:53 +0800
committerruki <[email protected]>2015-12-14 19:24:53 +0800
commitf846b32d3164628aac718e7eac7db718fc2b6dff (patch)
tree84892e8a75b6aac7222b4b38bdd984a094ffe77e
parentfae8f4057377fee825defedc57c63f953bc832bb (diff)
uses gcc linker for core
-rwxr-xr-xcore/plat/linux/prefix.mak2
-rwxr-xr-xcore/plat/mac/prefix.mak2
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,)