@@ -329,7 +329,7 @@ CFG_LDPATH_arm-unknown-linux-gnueabihf :=
329329CFG_RUN_arm-unknown-linux-gnueabihf =$(2 )
330330CFG_RUN_TARG_arm-unknown-linux-gnueabihf =$(call CFG_RUN_arm-unknown-linux-gnueabihf,,$(2 ) )
331331RUSTC_FLAGS_arm-unknown-linux-gnueabihf :=
332- RUSTC_CROSS_FLAGS_arm-unknown-linux-gnueabihf := --linker=$(CROSS_PREFIX_arm-unknown-linux-gnueabihf )$(CC_arm -unknown-linux-gnueabihf )
332+ RUSTC_CROSS_FLAGS_arm-unknown-linux-gnueabihf := --linker=$(CROSS_PREFIX_arm-unknown-linux-gnueabihf )$(CXX_arm -unknown-linux-gnueabihf )
333333
334334# arm-unknown-linux-gnueabi configuration
335335CROSS_PREFIX_arm-unknown-linux-gnueabi =arm-linux-gnueabi-
@@ -358,7 +358,7 @@ CFG_LDPATH_arm-unknown-linux-gnueabi :=
358358CFG_RUN_arm-unknown-linux-gnueabi =$(2 )
359359CFG_RUN_TARG_arm-unknown-linux-gnueabi =$(call CFG_RUN_arm-unknown-linux-gnueabi,,$(2 ) )
360360RUSTC_FLAGS_arm-unknown-linux-gnueabi :=
361- RUSTC_CROSS_FLAGS_arm-unknown-linux-gnueabi := --linker=$(CROSS_PREFIX_arm-unknown-linux-gnueabi )$(CC_arm -unknown-linux-gnueabi )
361+ RUSTC_CROSS_FLAGS_arm-unknown-linux-gnueabi := --linker=$(CROSS_PREFIX_arm-unknown-linux-gnueabi )$(CXX_arm -unknown-linux-gnueabi )
362362
363363# mips-unknown-linux-gnu configuration
364364CC_mips-unknown-linux-gnu =mips-linux-gnu-gcc
@@ -468,7 +468,7 @@ CFG_PATH_MUNGE_i686-w64-mingw32 :=
468468CFG_LDPATH_i686-w64-mingw32 :=$(CFG_LDPATH_i686-w64-mingw32 ) :$(PATH )
469469CFG_RUN_i686-w64-mingw32=PATH ="$(CFG_LDPATH_i686-w64-mingw32 ) :$(1 ) " $(2 )
470470CFG_RUN_TARG_i686-w64-mingw32 =$(call CFG_RUN_i686-w64-mingw32,$(HLIB$(1 ) _H_$(CFG_BUILD ) ) ,$(2 ) )
471- RUSTC_CROSS_FLAGS_i686-w64-mingw32 := --linker=$(CROSS_PREFIX_i686-w64-mingw32 )$(CC_i686 -w64-mingw32 )
471+ RUSTC_CROSS_FLAGS_i686-w64-mingw32 := --linker=$(CROSS_PREFIX_i686-w64-mingw32 )$(CXX_i686 -w64-mingw32 )
472472
473473# x86_64-w64-mingw32 configuration
474474CROSS_PREFIX_x86_64-w64-mingw32 =x86_64-w64-mingw32-
@@ -496,7 +496,7 @@ CFG_PATH_MUNGE_x86_64-w64-mingw32 :=
496496CFG_LDPATH_x86_64-w64-mingw32 :=$(CFG_LDPATH_x86_64-w64-mingw32 ) :$(PATH )
497497CFG_RUN_x86_64-w64-mingw32=PATH ="$(CFG_LDPATH_x86_64-w64-mingw32 ) :$(1 ) " $(2 )
498498CFG_RUN_TARG_x86_64-w64-mingw32 =$(call CFG_RUN_x86_64-w64-mingw32,$(HLIB$(1 ) _H_$(CFG_BUILD ) ) ,$(2 ) )
499- RUSTC_CROSS_FLAGS_x86_64-w64-mingw32 := --linker=$(CROSS_PREFIX_x86_64-w64-mingw32 )$(CC_x86_64 -w64-mingw32 )
499+ RUSTC_CROSS_FLAGS_x86_64-w64-mingw32 := --linker=$(CROSS_PREFIX_x86_64-w64-mingw32 )$(CXX_x86_64 -w64-mingw32 )
500500
501501# x86_64-unknown-freebsd configuration
502502CC_x86_64-unknown-freebsd =$(CC )
0 commit comments