Skip to content

Commit

Permalink
Use CXX not CC for linking.
Browse files Browse the repository at this point in the history
  • Loading branch information
@luqmana
luqmana committed Nov 23, 2013
1 parent 84403eb commit ae5a13d
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions mk/platform.mk
View file
Expand Up @@ -329,7 +329,7 @@ CFG_LDPATH_arm-unknown-linux-gnueabihf :=
CFG_RUN_arm-unknown-linux-gnueabihf=$(2)
CFG_RUN_TARG_arm-unknown-linux-gnueabihf=$(call CFG_RUN_arm-unknown-linux-gnueabihf,,$(2))
RUSTC_FLAGS_arm-unknown-linux-gnueabihf :=
RUSTC_CROSS_FLAGS_arm-unknown-linux-gnueabihf := --linker=$(CROSS_PREFIX_arm-unknown-linux-gnueabihf)$(CC_arm-unknown-linux-gnueabihf)
RUSTC_CROSS_FLAGS_arm-unknown-linux-gnueabihf := --linker=$(CROSS_PREFIX_arm-unknown-linux-gnueabihf)$(CXX_arm-unknown-linux-gnueabihf)

# arm-unknown-linux-gnueabi configuration
CROSS_PREFIX_arm-unknown-linux-gnueabi=arm-linux-gnueabi-
Expand Down Expand Up @@ -358,7 +358,7 @@ CFG_LDPATH_arm-unknown-linux-gnueabi :=
CFG_RUN_arm-unknown-linux-gnueabi=$(2)
CFG_RUN_TARG_arm-unknown-linux-gnueabi=$(call CFG_RUN_arm-unknown-linux-gnueabi,,$(2))
RUSTC_FLAGS_arm-unknown-linux-gnueabi :=
RUSTC_CROSS_FLAGS_arm-unknown-linux-gnueabi := --linker=$(CROSS_PREFIX_arm-unknown-linux-gnueabi)$(CC_arm-unknown-linux-gnueabi)
RUSTC_CROSS_FLAGS_arm-unknown-linux-gnueabi := --linker=$(CROSS_PREFIX_arm-unknown-linux-gnueabi)$(CXX_arm-unknown-linux-gnueabi)

# mips-unknown-linux-gnu configuration
CC_mips-unknown-linux-gnu=mips-linux-gnu-gcc
Expand Down Expand Up @@ -468,7 +468,7 @@ CFG_PATH_MUNGE_i686-w64-mingw32 :=
CFG_LDPATH_i686-w64-mingw32 :=$(CFG_LDPATH_i686-w64-mingw32):$(PATH)
CFG_RUN_i686-w64-mingw32=PATH="$(CFG_LDPATH_i686-w64-mingw32):$(1)" $(2)
CFG_RUN_TARG_i686-w64-mingw32=$(call CFG_RUN_i686-w64-mingw32,$(HLIB$(1)_H_$(CFG_BUILD)),$(2))
RUSTC_CROSS_FLAGS_i686-w64-mingw32 := --linker=$(CROSS_PREFIX_i686-w64-mingw32)$(CC_i686-w64-mingw32)
RUSTC_CROSS_FLAGS_i686-w64-mingw32 := --linker=$(CROSS_PREFIX_i686-w64-mingw32)$(CXX_i686-w64-mingw32)

# x86_64-w64-mingw32 configuration
CROSS_PREFIX_x86_64-w64-mingw32=x86_64-w64-mingw32-
Expand Down Expand Up @@ -496,7 +496,7 @@ CFG_PATH_MUNGE_x86_64-w64-mingw32 :=
CFG_LDPATH_x86_64-w64-mingw32 :=$(CFG_LDPATH_x86_64-w64-mingw32):$(PATH)
CFG_RUN_x86_64-w64-mingw32=PATH="$(CFG_LDPATH_x86_64-w64-mingw32):$(1)" $(2)
CFG_RUN_TARG_x86_64-w64-mingw32=$(call CFG_RUN_x86_64-w64-mingw32,$(HLIB$(1)_H_$(CFG_BUILD)),$(2))
RUSTC_CROSS_FLAGS_x86_64-w64-mingw32 := --linker=$(CROSS_PREFIX_x86_64-w64-mingw32)$(CC_x86_64-w64-mingw32)
RUSTC_CROSS_FLAGS_x86_64-w64-mingw32 := --linker=$(CROSS_PREFIX_x86_64-w64-mingw32)$(CXX_x86_64-w64-mingw32)

# x86_64-unknown-freebsd configuration
CC_x86_64-unknown-freebsd=$(CC)
Expand Down

5 comments on commit ae5a13d

@bors
Copy link
Contributor

@bors bors commented on ae5a13d Nov 24, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at luqmana@ae5a13d

@bors
Copy link
Contributor

@bors bors commented on ae5a13d Nov 24, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging luqmana/rust/mingw64 = ae5a13d into auto

@bors
Copy link
Contributor

@bors bors commented on ae5a13d Nov 24, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

luqmana/rust/mingw64 = ae5a13d merged ok, testing candidate = 9ba473f

@bors
Copy link
Contributor

@bors bors commented on ae5a13d Nov 24, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/2591
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-c/builds/437
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-t/builds/437
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/2595
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/1701
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/1700
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/2608
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/1700
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/1700
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/2609
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/1700
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/1700
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/1776
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/2596
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/1700
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/1702
success: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/2372

@bors
Copy link
Contributor

@bors bors commented on ae5a13d Nov 24, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 9ba473f

Please sign in to comment.