From bce5fb5a6eaa3105df6b7faba1ee0845c3232783 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Mon, 10 Apr 2017 11:23:03 -0500 Subject: [PATCH] move the compiler-rt submodule to the root --- .gitmodules | 2 +- build.rs | 3 +-- c/compiler-rt => compiler-rt | 0 3 files changed, 2 insertions(+), 3 deletions(-) rename c/compiler-rt => compiler-rt (100%) diff --git a/.gitmodules b/.gitmodules index ed1a78f..bbdcf70 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "compiler-rt/compiler-rt-cdylib/compiler-rt"] - path = c/compiler-rt + path = compiler-rt url = https://github.com/rust-lang/compiler-rt diff --git a/build.rs b/build.rs index 145f715..46aa05e 100644 --- a/build.rs +++ b/build.rs @@ -37,7 +37,6 @@ mod c { use std::collections::BTreeMap; use std::env; - use std::io::Write; use std::path::Path; struct Sources { @@ -413,7 +412,7 @@ mod c { Path::new(".") }; - let src_dir = root.join("c/compiler-rt/lib/builtins"); + let src_dir = root.join("compiler-rt/lib/builtins"); for src in sources.map.values() { let src = src_dir.join(src); cfg.file(&src); diff --git a/c/compiler-rt b/compiler-rt similarity index 100% rename from c/compiler-rt rename to compiler-rt