Skip to content

Commit

Permalink
Rollup merge of #39431 - alexcrichton:no-more-makefiles, r=brson
Browse files Browse the repository at this point in the history
Delete the makefile build system

This PR deletes the makefile build system in favor of the rustbuild build system. The beta has now been branched so 1.16 will continue to be buildable from the makefiles, but going forward 1.17 will only be buildable with rustbuild.

Rustbuild has been the default build system [since 1.15.0](rust-lang/rust#37817) and the makefiles were [proposed for deletion](https://internals.rust-lang.org/t/proposal-for-promoting-rustbuild-to-official-status/4368) at this time back in November of last year.

And now with the deletion of these makefiles we can start getting those sweet sweet improvements of using crates.io crates in the compiler!
  • Loading branch information
frewsxcv authored Feb 8, 2017
2 parents 563f6ec + c42d470 commit 1bfde0c
Showing 10 changed files with 6 additions and 97 deletions.
1 change: 0 additions & 1 deletion src/build.rs
Original file line number Diff line number Diff line change
@@ -21,7 +21,6 @@ use std::process::Command;
use build_helper::{run, rerun_if_changed_anything_in_dir, up_to_date};

fn main() {
println!("cargo:rustc-cfg=cargobuild");
println!("cargo:rerun-if-changed=build.rs");

let target = env::var("TARGET").expect("TARGET was not set");
3 changes: 0 additions & 3 deletions src/lib.rs
Original file line number Diff line number Diff line change
@@ -464,9 +464,6 @@ mod panicking;
mod rand;
mod memchr;

// This module just defines per-platform native library dependencies
mod rtdeps;

// The runtime entry point and a few unstable public functions used by the
// compiler
pub mod rt;
6 changes: 3 additions & 3 deletions src/panicking.rs
Original file line number Diff line number Diff line change
@@ -311,12 +311,12 @@ impl<'a> Location<'a> {
}

fn default_hook(info: &PanicInfo) {
#[cfg(any(not(cargobuild), feature = "backtrace"))]
#[cfg(feature = "backtrace")]
use sys_common::backtrace;

// If this is a double panic, make sure that we print a backtrace
// for this panic. Otherwise only print it if logging is enabled.
#[cfg(any(not(cargobuild), feature = "backtrace"))]
#[cfg(feature = "backtrace")]
let log_backtrace = {
let panics = update_panic_count(0);

@@ -341,7 +341,7 @@ fn default_hook(info: &PanicInfo) {
let _ = writeln!(err, "thread '{}' panicked at '{}', {}:{}",
name, msg, file, line);

#[cfg(any(not(cargobuild), feature = "backtrace"))]
#[cfg(feature = "backtrace")]
{
use sync::atomic::{AtomicBool, Ordering};

68 changes: 0 additions & 68 deletions src/rtdeps.rs

This file was deleted.

5 changes: 0 additions & 5 deletions src/sys/unix/args.rs
Original file line number Diff line number Diff line change
@@ -189,11 +189,6 @@ mod imp {
fn objc_msgSend_ul(obj: NsId, sel: Sel, ...) -> NsId;
}

#[link(name = "Foundation", kind = "framework")]
#[link(name = "objc")]
#[cfg(not(cargobuild))]
extern {}

type Sel = *const libc::c_void;
type NsId = *const libc::c_void;

2 changes: 1 addition & 1 deletion src/sys/unix/mod.rs
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ pub mod weak;

pub mod args;
pub mod android;
#[cfg(any(not(cargobuild), feature = "backtrace"))]
#[cfg(feature = "backtrace")]
pub mod backtrace;
pub mod condvar;
pub mod env;
4 changes: 0 additions & 4 deletions src/sys/unix/rand.rs
Original file line number Diff line number Diff line change
@@ -257,10 +257,6 @@ mod imp {
#[allow(non_upper_case_globals)]
const kSecRandomDefault: *const SecRandom = ptr::null();

#[link(name = "Security", kind = "framework")]
#[cfg(not(cargobuild))]
extern {}

extern {
fn SecRandomCopyBytes(rnd: *const SecRandom,
count: size_t, bytes: *mut u8) -> c_int;
7 changes: 0 additions & 7 deletions src/sys/windows/c.rs
Original file line number Diff line number Diff line change
@@ -833,13 +833,6 @@ pub struct CONSOLE_READCONSOLE_CONTROL {
}
pub type PCONSOLE_READCONSOLE_CONTROL = *mut CONSOLE_READCONSOLE_CONTROL;

#[link(name = "ws2_32")]
#[link(name = "userenv")]
#[link(name = "shell32")]
#[link(name = "advapi32")]
#[cfg(not(cargobuild))]
extern {}

extern "system" {
pub fn WSAStartup(wVersionRequested: WORD,
lpWSAData: LPWSADATA) -> c_int;
3 changes: 0 additions & 3 deletions src/sys_common/gnu/libbacktrace.rs
Original file line number Diff line number Diff line change
@@ -39,9 +39,6 @@ pub fn print(w: &mut Write, idx: isize, addr: *mut libc::c_void,
msg: *const libc::c_char,
errnum: libc::c_int);
enum backtrace_state {}
#[link(name = "backtrace", kind = "static")]
#[cfg(all(not(test), not(cargobuild)))]
extern {}

extern {
fn backtrace_create_state(filename: *const libc::c_char,
4 changes: 2 additions & 2 deletions src/sys_common/mod.rs
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ use sync::Once;
use sys;

pub mod at_exit_imp;
#[cfg(any(not(cargobuild), feature = "backtrace"))]
#[cfg(feature = "backtrace")]
pub mod backtrace;
pub mod condvar;
pub mod io;
@@ -50,7 +50,7 @@ pub use sys::net;
#[cfg(not(target_os = "redox"))]
pub mod net;

#[cfg(any(not(cargobuild), feature = "backtrace"))]
#[cfg(feature = "backtrace")]
#[cfg(any(all(unix, not(any(target_os = "macos", target_os = "ios", target_os = "emscripten"))),
all(windows, target_env = "gnu")))]
pub mod gnu;

0 comments on commit 1bfde0c

Please sign in to comment.