Skip to content

Commit ffdda22

Browse files
luqmanaluqmana
committed
mk: Fix non-android cross builds.
1 parent 58eeb07 commit ffdda22

File tree

5 files changed

+31
-19
lines changed

5 files changed

+31
-19
lines changed

‎mk/platform.mk

+9-8
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ CFG_PATH_MUNGE_arm-linux-androideabi := true
300300
CFG_LDPATH_arm-linux-androideabi :=
301301
CFG_RUN_arm-linux-androideabi=
302302
CFG_RUN_TARG_arm-linux-androideabi=
303-
RUSTC_FLAGS_arm-linux-androideabi :=-C android-cross-path=$(CFG_ANDROID_CROSS_PATH)
303+
RUSTC_FLAGS_arm-linux-androideabi :=
304304
RUSTC_CROSS_FLAGS_arm-linux-androideabi :=-C android-cross-path=$(CFG_ANDROID_CROSS_PATH)
305305

306306
# arm-unknown-linux-gnueabihf configuration
@@ -331,7 +331,7 @@ CFG_LDPATH_arm-unknown-linux-gnueabihf :=
331331
CFG_RUN_arm-unknown-linux-gnueabihf=$(2)
332332
CFG_RUN_TARG_arm-unknown-linux-gnueabihf=$(call CFG_RUN_arm-unknown-linux-gnueabihf,,$(2))
333333
RUSTC_FLAGS_arm-unknown-linux-gnueabihf :=
334-
RUSTC_CROSS_FLAGS_arm-unknown-linux-gnueabihf := --linker=$(CROSS_PREFIX_arm-unknown-linux-gnueabihf)$(CXX_arm-unknown-linux-gnueabihf)
334+
RUSTC_CROSS_FLAGS_arm-unknown-linux-gnueabihf :=
335335

336336
# arm-unknown-linux-gnueabi configuration
337337
CROSS_PREFIX_arm-unknown-linux-gnueabi=arm-linux-gnueabi-
@@ -343,7 +343,7 @@ CFG_LIB_NAME_arm-unknown-linux-gnueabi=lib$(1).so
343343
CFG_STATIC_LIB_NAME_arm-unknown-linux-gnueabi=lib$(1).a
344344
CFG_LIB_GLOB_arm-unknown-linux-gnueabi=lib$(1)-*.so
345345
CFG_LIB_DSYM_GLOB_arm-unknown-linux-gnueabi=lib$(1)-*.dylib.dSYM
346-
CFG_GCCISH_CFLAGS_arm-unknown-linux-gnueabi := -Wall -g -fPIC -D__arm__
346+
CFG_GCCISH_CFLAGS_arm-unknown-linux-gnueabi := -Wall -g -fPIC -D__arm__ -mfpu=vfp
347347
CFG_GCCISH_CXXFLAGS_arm-unknown-linux-gnueabi := -fno-rtti
348348
CFG_GCCISH_LINK_FLAGS_arm-unknown-linux-gnueabi := -shared -fPIC -g
349349
CFG_GCCISH_DEF_FLAG_arm-unknown-linux-gnueabi := -Wl,--export-dynamic,--dynamic-list=
@@ -361,7 +361,7 @@ CFG_LDPATH_arm-unknown-linux-gnueabi :=
361361
CFG_RUN_arm-unknown-linux-gnueabi=$(2)
362362
CFG_RUN_TARG_arm-unknown-linux-gnueabi=$(call CFG_RUN_arm-unknown-linux-gnueabi,,$(2))
363363
RUSTC_FLAGS_arm-unknown-linux-gnueabi :=
364-
RUSTC_CROSS_FLAGS_arm-unknown-linux-gnueabi := --linker=$(CROSS_PREFIX_arm-unknown-linux-gnueabi)$(CXX_arm-unknown-linux-gnueabi)
364+
RUSTC_CROSS_FLAGS_arm-unknown-linux-gnueabi :=
365365

366366
# mips-unknown-linux-gnu configuration
367367
CC_mips-unknown-linux-gnu=mips-linux-gnu-gcc
@@ -389,7 +389,7 @@ CFG_PATH_MUNGE_mips-unknown-linux-gnu := true
389389
CFG_LDPATH_mips-unknown-linux-gnu :=
390390
CFG_RUN_mips-unknown-linux-gnu=
391391
CFG_RUN_TARG_mips-unknown-linux-gnu=
392-
RUSTC_FLAGS_mips-unknown-linux-gnu := --linker=$(CXX_mips-unknown-linux-gnu) --target-cpu mips32r2 --target-feature +mips32r2,+o32 -Z soft-float
392+
RUSTC_FLAGS_mips-unknown-linux-gnu := -C target-cpu=mips32r2 -C target-feature="+mips32r2,+o32" -C soft-float
393393

394394
# i686-pc-mingw32 configuration
395395
CC_i686-pc-mingw32=$(CC)
@@ -475,7 +475,7 @@ CFG_PATH_MUNGE_i686-w64-mingw32 :=
475475
CFG_LDPATH_i686-w64-mingw32 :=$(CFG_LDPATH_i686-w64-mingw32):$(PATH)
476476
CFG_RUN_i686-w64-mingw32=PATH="$(CFG_LDPATH_i686-w64-mingw32):$(1)" $(2)
477477
CFG_RUN_TARG_i686-w64-mingw32=$(call CFG_RUN_i686-w64-mingw32,$(HLIB$(1)_H_$(CFG_BUILD)),$(2))
478-
RUSTC_CROSS_FLAGS_i686-w64-mingw32 := --linker=$(CROSS_PREFIX_i686-w64-mingw32)$(CXX_i686-w64-mingw32)
478+
RUSTC_CROSS_FLAGS_i686-w64-mingw32 :=
479479

480480
# x86_64-w64-mingw32 configuration
481481
CROSS_PREFIX_x86_64-w64-mingw32=x86_64-w64-mingw32-
@@ -504,7 +504,7 @@ CFG_PATH_MUNGE_x86_64-w64-mingw32 :=
504504
CFG_LDPATH_x86_64-w64-mingw32 :=$(CFG_LDPATH_x86_64-w64-mingw32):$(PATH)
505505
CFG_RUN_x86_64-w64-mingw32=PATH="$(CFG_LDPATH_x86_64-w64-mingw32):$(1)" $(2)
506506
CFG_RUN_TARG_x86_64-w64-mingw32=$(call CFG_RUN_x86_64-w64-mingw32,$(HLIB$(1)_H_$(CFG_BUILD)),$(2))
507-
RUSTC_CROSS_FLAGS_x86_64-w64-mingw32 := --linker=$(CROSS_PREFIX_x86_64-w64-mingw32)$(CXX_x86_64-w64-mingw32)
507+
RUSTC_CROSS_FLAGS_x86_64-w64-mingw32 :=
508508

509509
# x86_64-unknown-freebsd configuration
510510
CC_x86_64-unknown-freebsd=$(CC)
@@ -549,8 +549,9 @@ define CFG_MAKE_TOOLCHAIN
549549
CXX_$(1)=$(CROSS_PREFIX_$(1))$(CXX_$(1))
550550
CPP_$(1)=$(CROSS_PREFIX_$(1))$(CPP_$(1))
551551
AR_$(1)=$(CROSS_PREFIX_$(1))$(AR_$(1))
552+
RUSTC_CROSS_FLAGS_$(1)=-C linker=$$(CXX_$(1)) -C ar=$$(AR_$(1)) $(RUSTC_CROSS_FLAGS_$(1))
552553

553-
RUSTC_FLAGS_$(1)=$(RUSTC_CROSS_FLAGS_$(1))
554+
RUSTC_FLAGS_$(1)=$$(RUSTC_CROSS_FLAGS_$(1)) $(RUSTC_FLAGS_$(1))
554555
endif
555556

556557
CFG_COMPILE_C_$(1) = $$(CC_$(1)) \

‎mk/tests.mk

+2-1
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,8 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \
553553
--host $(3) \
554554
--adb-path=$(CFG_ADB) \
555555
--adb-test-dir=$(CFG_ADB_TEST_DIR) \
556-
--rustcflags "$(RUSTC_FLAGS_$(2)) $$(CTEST_RUSTC_FLAGS) -L $$(RT_OUTPUT_DIR_$(2))" \
556+
--host-rustcflags "$(RUSTC_FLAGS_$(3)) $$(CTEST_RUSTC_FLAGS) -L $$(RT_OUTPUT_DIR_$(2))" \
557+
--target-rustcflags "$(RUSTC_FLAGS_$(2)) $$(CTEST_RUSTC_FLAGS) -L $$(RT_OUTPUT_DIR_$(2))" \
557558
$$(CTEST_TESTARGS)
558559

559560
CTEST_DEPS_rpass_$(1)-T-$(2)-H-$(3) = $$(RPASS_TESTS)

‎src/compiletest/common.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,11 @@ pub struct config {
7777
// for running under valgrind
7878
runtool: Option<~str>,
7979

80-
// Flags to pass to the compiler
81-
rustcflags: Option<~str>,
80+
// Flags to pass to the compiler when building for the host
81+
host_rustcflags: Option<~str>,
82+
83+
// Flags to pass to the compiler when building for the target
84+
target_rustcflags: Option<~str>,
8285

8386
// Run tests using the JIT
8487
jit: bool,

‎src/compiletest/compiletest.rs

+6-3
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ pub fn parse_config(args: ~[~str]) -> config {
6464
optflag("", "ignored", "run tests marked as ignored"),
6565
optopt("", "runtool", "supervisor program to run tests under \
6666
(eg. emulator, valgrind)", "PROGRAM"),
67-
optopt("", "rustcflags", "flags to pass to rustc", "FLAGS"),
67+
optopt("", "host-rustcflags", "flags to pass to rustc for host", "FLAGS"),
68+
optopt("", "target-rustcflags", "flags to pass to rustc for target", "FLAGS"),
6869
optflag("", "verbose", "run tests verbosely, showing all output"),
6970
optopt("", "logfile", "file to log test execution to", "FILE"),
7071
optopt("", "save-metrics", "file to save metrics to", "FILE"),
@@ -132,7 +133,8 @@ pub fn parse_config(args: ~[~str]) -> config {
132133
ratchet_noise_percent:
133134
matches.opt_str("ratchet-noise-percent").and_then(|s| from_str::<f64>(s)),
134135
runtool: matches.opt_str("runtool"),
135-
rustcflags: matches.opt_str("rustcflags"),
136+
host_rustcflags: matches.opt_str("host-rustcflags"),
137+
target_rustcflags: matches.opt_str("target-rustcflags"),
136138
jit: matches.opt_present("jit"),
137139
target: opt_str2(matches.opt_str("target")).to_str(),
138140
host: opt_str2(matches.opt_str("host")).to_str(),
@@ -161,7 +163,8 @@ pub fn log_config(config: &config) {
161163
logv(c, format!("run_ignored: {}", config.run_ignored));
162164
logv(c, format!("filter: {}", opt_str(&config.filter)));
163165
logv(c, format!("runtool: {}", opt_str(&config.runtool)));
164-
logv(c, format!("rustcflags: {}", opt_str(&config.rustcflags)));
166+
logv(c, format!("host-rustcflags: {}", opt_str(&config.host_rustcflags)));
167+
logv(c, format!("target-rustcflags: {}", opt_str(&config.target_rustcflags)));
165168
logv(c, format!("jit: {}", config.jit));
166169
logv(c, format!("target: {}", config.target));
167170
logv(c, format!("host: {}", config.host));

‎src/compiletest/runtest.rs

+9-5
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ actual:\n\
250250
~"-L", config.build_base.as_str().unwrap().to_owned(),
251251
~"-L",
252252
aux_dir.as_str().unwrap().to_owned()];
253-
args.push_all_move(split_maybe_args(&config.rustcflags));
253+
args.push_all_move(split_maybe_args(&config.target_rustcflags));
254254
args.push_all_move(split_maybe_args(&props.compile_flags));
255255
// FIXME (#9639): This needs to handle non-utf8 paths
256256
return ProcArgs {prog: config.rustc_path.as_str().unwrap().to_owned(), args: args};
@@ -260,9 +260,9 @@ actual:\n\
260260
fn run_debuginfo_test(config: &config, props: &TestProps, testfile: &Path) {
261261

262262
// do not optimize debuginfo tests
263-
let mut config = match config.rustcflags {
263+
let mut config = match config.target_rustcflags {
264264
Some(ref flags) => config {
265-
rustcflags: Some(flags.replace("-O", "")),
265+
target_rustcflags: Some(flags.replace("-O", "")),
266266
.. (*config).clone()
267267
},
268268
None => (*config).clone()
@@ -329,7 +329,7 @@ fn run_debuginfo_test(config: &config, props: &TestProps, testfile: &Path) {
329329
break;
330330
}
331331

332-
let args = split_maybe_args(&config.rustcflags);
332+
let args = split_maybe_args(&config.target_rustcflags);
333333
let mut tool_path:~str = ~"";
334334
for arg in args.iter() {
335335
if arg.contains("android-cross-path=") {
@@ -770,7 +770,11 @@ fn make_compile_args(config: &config,
770770
ThisDirectory(path) => { args.push(~"--out-dir"); path }
771771
};
772772
args.push(path.as_str().unwrap().to_owned());
773-
args.push_all_move(split_maybe_args(&config.rustcflags));
773+
if props.force_host {
774+
args.push_all_move(split_maybe_args(&config.host_rustcflags));
775+
} else {
776+
args.push_all_move(split_maybe_args(&config.target_rustcflags));
777+
}
774778
args.push_all_move(split_maybe_args(&props.compile_flags));
775779
return ProcArgs {prog: config.rustc_path.as_str().unwrap().to_owned(), args: args};
776780
}

0 commit comments

Comments
 (0)