configure: Rework how we select linker

ecv80 · Feb 16, 2016 · a60c90b · a60c90b
1 parent 9c4e571
commit a60c90b
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 4 deletions.
diff --git a/configure.nacl b/configure.nacl
@@ -81,7 +81,6 @@ fi
 TOOLCHAIN=${PEPPER}/toolchain/${HOSTENV}_pnacl/bin/pnacl-
 
 CC=${TOOLCHAIN}clang
-LINKER=${TOOLCHAIN}clang
 FINALIZE=${TOOLCHAIN}finalize
 CXX=${TOOLCHAIN}clang++
 

diff --git a/configure.osx b/configure.osx
@@ -22,7 +22,6 @@ ARCH=`uname -m`
 MACOSXTARGET=""
 MACOSXSDK=""
 CC=cc
-LINKER=cc
 CXX=c++
 
 show_help(){

diff --git a/configure.ps3 b/configure.ps3
@@ -18,7 +18,6 @@ CONFIGURE_POSTFIX="ps3"
 source support/configure.inc
 TOOLCHAIN="${PS3DEV}/host/ppu/bin/ppu-"
 CC=${TOOLCHAIN}gcc
-LINKER=${TOOLCHAIN}gcc
 
 LIBAV_CFLAGS="-mminimal-toc -I${PSL1GHT}/target/include -B${PSL1GHT}/target/lib -B${PS3DEV}/host/ppu/lib -I${PS3DEV}/host/ppu/include -include ${TOPDIR}/support/nostrictansi.h"
 

diff --git a/configure.rpi b/configure.rpi
@@ -47,7 +47,6 @@ done
 [ -z "$TOOLCHAIN" ] && die_cause "--toolchain not specified"
 
 CC=${TOOLCHAIN}gcc
-LINKER=${TOOLCHAIN}gcc
 CXX=${TOOLCHAIN}g++
 
 setup_env "$@"

diff --git a/support/configure.inc b/support/configure.inc
@@ -20,6 +20,7 @@ DEFAULT_LOGTARGET=""
 APPNAME="Movian"
 OPTLEVEL=2
 PLUGINREPO="https://plugins.movian.tv/repo/plugins-v1.json"
+LINKER="\${CC}" # Default is to link with c-compiler
 
 CONFIG_LIST="
  libasound