vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Update libstd, remove openlibm (now inside of libstd)

Browse source
This commit is contained in:
Jeremy Soller 2016-10-31 12:37:29 -06:00
parent 9ba04a065e
commit 27375c89c2
4 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -10,9 +10,6 @@
[submodule "ion"] [submodule "ion"]
path = programs/ion path = programs/ion
url = https://github.com/redox-os/ion.git url = https://github.com/redox-os/ion.git
[submodule "openlibm"]
path = openlibm
url = https://github.com/redox-os/openlibm.git
[submodule "programs/coreutils"] [submodule "programs/coreutils"]
path = programs/coreutils path = programs/coreutils
url = https://github.com/redox-os/coreutils.git url = https://github.com/redox-os/coreutils.git

6
Makefile
View file

@ -227,10 +227,10 @@ $(BUILD)/librand.rlib: rust/src/librand/lib.rs $(BUILD)/libcore.rlib
$(BUILD)/librustc_unicode.rlib: rust/src/librustc_unicode/lib.rs $(BUILD)/libcore.rlib $(BUILD)/librustc_unicode.rlib: rust/src/librustc_unicode/lib.rs $(BUILD)/libcore.rlib
$(RUSTC) $(RUSTCFLAGS) -o $@ $< $(RUSTC) $(RUSTCFLAGS) -o $@ $<
openlibm/libopenlibm.a: libstd/openlibm/libopenlibm.a:
CROSSCC=$(CC) CFLAGS=-fno-stack-protector make -C openlibm libopenlibm.a CROSSCC=$(CC) CFLAGS=-fno-stack-protector make -C libstd/openlibm libopenlibm.a
$(BUILD)/libopenlibm.a: openlibm/libopenlibm.a $(BUILD)/libopenlibm.a: libstd/openlibm/libopenlibm.a
mkdir -p $(BUILD) mkdir -p $(BUILD)
cp $< $@ cp $< $@

2
libstd

@ -1 +1 @@
Subproject commit 263ed59929e68073bd4e47ba07f2fbe283ee2854 Subproject commit b42d1d72320a5f75e547d1dbfc8b9cf9fa124056

1
openlibm

@ -1 +0,0 @@
Subproject commit 3c837e79655c4be724efb945a6345ec97c07635c