From 1cda3236c9d0fe59e6ce5faa3803955533fe4aef Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Fri, 22 May 2015 14:56:41 -0700 Subject: [PATCH] Specify linkers for cross-compile scenarios The recent MSVC patch made the build system pass explicit linkers to rustc, but did not set that up for anything other than MSVC. --- mk/cfg/i686-apple-darwin.mk | 1 + mk/cfg/i686-unknown-linux-gnu.mk | 1 + mk/cfg/x86_64-apple-darwin.mk | 1 + mk/cfg/x86_64-unknown-linux-gnu.mk | 1 + 4 files changed, 4 insertions(+) diff --git a/mk/cfg/i686-apple-darwin.mk b/mk/cfg/i686-apple-darwin.mk index 7ebb492bb21..25b692449aa 100644 --- a/mk/cfg/i686-apple-darwin.mk +++ b/mk/cfg/i686-apple-darwin.mk @@ -1,5 +1,6 @@ # i686-apple-darwin configuration CC_i686-apple-darwin=$(CC) +LINK_i686-apple-darwin=cc CXX_i686-apple-darwin=$(CXX) CPP_i686-apple-darwin=$(CPP) AR_i686-apple-darwin=$(AR) diff --git a/mk/cfg/i686-unknown-linux-gnu.mk b/mk/cfg/i686-unknown-linux-gnu.mk index 88c0907f63b..1c5de9a2c05 100644 --- a/mk/cfg/i686-unknown-linux-gnu.mk +++ b/mk/cfg/i686-unknown-linux-gnu.mk @@ -1,5 +1,6 @@ # i686-unknown-linux-gnu configuration CC_i686-unknown-linux-gnu=$(CC) +LINK_i686-unknown-linux-gnu=cc CXX_i686-unknown-linux-gnu=$(CXX) CPP_i686-unknown-linux-gnu=$(CPP) AR_i686-unknown-linux-gnu=$(AR) diff --git a/mk/cfg/x86_64-apple-darwin.mk b/mk/cfg/x86_64-apple-darwin.mk index 4c68d3dcf37..9d3361b7fc6 100644 --- a/mk/cfg/x86_64-apple-darwin.mk +++ b/mk/cfg/x86_64-apple-darwin.mk @@ -1,5 +1,6 @@ # x86_64-apple-darwin configuration CC_x86_64-apple-darwin=$(CC) +LINK_x86_64-apple-darwin=cc CXX_x86_64-apple-darwin=$(CXX) CPP_x86_64-apple-darwin=$(CPP) AR_x86_64-apple-darwin=$(AR) diff --git a/mk/cfg/x86_64-unknown-linux-gnu.mk b/mk/cfg/x86_64-unknown-linux-gnu.mk index 044c687c9fc..1735d1eb3f7 100644 --- a/mk/cfg/x86_64-unknown-linux-gnu.mk +++ b/mk/cfg/x86_64-unknown-linux-gnu.mk @@ -1,5 +1,6 @@ # x86_64-unknown-linux-gnu configuration CC_x86_64-unknown-linux-gnu=$(CC) +LINK_x86_64-unknown-linux-gnu=cc CXX_x86_64-unknown-linux-gnu=$(CXX) CPP_x86_64-unknown-linux-gnu=$(CPP) AR_x86_64-unknown-linux-gnu=$(AR)