revert changes used for local testing

japaric · Jan 30, 2016 · 146dfce · 146dfce
1 parent 7b026f0
commit 146dfce
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -16,5 +16,4 @@
 	url = https://github.com/rust-lang/rust-installer.git
 [submodule "src/liblibc"]
 	path = src/liblibc
-	url = https://github.com/japaric/libc.git
-	branch = mips-musl
+	url = https://github.com/rust-lang-nursery/libc.git
diff --git a/mk/cfg/mips-unknown-linux-musl.mk b/mk/cfg/mips-unknown-linux-musl.mk
@@ -1,8 +1,8 @@
 # mips-unknown-linux-musl configuration
-CC_mips-unknown-linux-musl=mips-openwrt-linux-gcc
-CXX_mips-unknown-linux-musl=mips-openwrt-linux-g++
-CPP_mips-unknown-linux-musl=mips-openwrt-linux-gcc -E
-AR_mips-unknown-linux-musl=mips-openwrt-linux-ar
+CC_mips-unknown-linux-musl=mips-linux-musl-gcc
+CXX_mips-unknown-linux-musl=mips-linux-musl-g++
+CPP_mips-unknown-linux-musl=mips-linux-musl-gcc -E
+AR_mips-unknown-linux-musl=mips-linux-musl-ar
 CFG_LIB_NAME_mips-unknown-linux-musl=lib$(1).so
 CFG_STATIC_LIB_NAME_mips-unknown-linux-musl=lib$(1).a
 CFG_LIB_GLOB_mips-unknown-linux-musl=lib$(1)-*.so

diff --git a/mk/cfg/mipsel-unknown-linux-musl.mk b/mk/cfg/mipsel-unknown-linux-musl.mk
@@ -1,8 +1,8 @@
 # mipsel-unknown-linux-musl configuration
-CC_mipsel-unknown-linux-musl=mipsel-openwrt-linux-gcc
-CXX_mipsel-unknown-linux-musl=mipsel-openwrt-linux-g++
-CPP_mipsel-unknown-linux-musl=mipsel-openwrt-linux-gcc
-AR_mipsel-unknown-linux-musl=mipsel-openwrt-linux-ar
+CC_mipsel-unknown-linux-musl=mipsel-linux-musl-gcc
+CXX_mipsel-unknown-linux-musl=mipsel-linux-musl-g++
+CPP_mipsel-unknown-linux-musl=mipsel-linux-musl-gcc
+AR_mipsel-unknown-linux-musl=mipsel-linux-musl-ar
 CFG_LIB_NAME_mipsel-unknown-linux-musl=lib$(1).so
 CFG_STATIC_LIB_NAME_mipsel-unknown-linux-musl=lib$(1).a
 CFG_LIB_GLOB_mipsel-unknown-linux-musl=lib$(1)-*.so

diff --git a/src/liblibc b/src/liblibc