diff options
| author | Jorge Aparicio <japaricious@gmail.com> | 2016-01-30 03:24:24 -0500 |
|---|---|---|
| committer | Jorge Aparicio <japaricious@gmail.com> | 2016-01-30 14:44:38 -0500 |
| commit | 146dfce803e85844cd14bb6967594efae4dcdb13 (patch) | |
| tree | 2174227d5dc47a833b076d4c7e519545a8d20aed | |
| parent | 7b026f0355a5394358e6a9758185db8eec850e0f (diff) | |
revert changes used for local testing
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | mk/cfg/mips-unknown-linux-musl.mk | 8 | ||||
| -rw-r--r-- | mk/cfg/mipsel-unknown-linux-musl.mk | 8 | ||||
| m--------- | src/liblibc | 0 |
4 files changed, 9 insertions, 10 deletions
diff --git a/.gitmodules b/.gitmodules index 1c0da895469..eb033f5401d 100644 --- 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 index f7892bf041f..e9a6891a1b2 100644 --- 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 index 632423cc881..659c71596d3 100644 --- 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 -Subproject 81c05bcddb05d0e5facf66f3945405bbf50b04d +Subproject 53d11fc6ef10b7c30e85e9f2ff1f67f81ec8636 |