diff options
| author | Baoshan Pang <baoshan.pang@windriver.com> | 2019-08-12 10:46:57 -0700 |
|---|---|---|
| committer | Baoshan Pang <baoshan.pang@windriver.com> | 2019-08-13 22:07:43 -0700 |
| commit | f161efac2bb37b40d4082256ca776ca2dbc7c0e6 (patch) | |
| tree | 1e7589e142dd65f5b8acfbfd735c4aa9caa11a5a /src/bootstrap | |
| parent | 60960a260f7b5c695fd0717311d72ce62dd4eb43 (diff) | |
| download | rust-f161efac2bb37b40d4082256ca776ca2dbc7c0e6.tar.gz rust-f161efac2bb37b40d4082256ca776ca2dbc7c0e6.zip | |
1. support crt-static
2. change armv7_wrs_vxworks to armv7_wrs_vxworks_eabihf. 3. use wr-** instead of vx-** 4. set PIE to false 5. code cleanup
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/cc_detect.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/cc_detect.rs b/src/bootstrap/cc_detect.rs index c58a98bac36..a4cb81d3d1b 100644 --- a/src/bootstrap/cc_detect.rs +++ b/src/bootstrap/cc_detect.rs @@ -46,7 +46,7 @@ fn cc2ar(cc: &Path, target: &str) -> Option<PathBuf> { } else if target.contains("openbsd") { Some(PathBuf::from("ar")) } else if target.contains("vxworks") { - Some(PathBuf::from("vx-ar")) + Some(PathBuf::from("wr-ar")) } else { let parent = cc.parent().unwrap(); let file = cc.file_name().unwrap().to_str().unwrap(); |
