From fa8dae8466dd5624f7ef3d380798e18e323ba851 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Wed, 14 Dec 2016 15:45:18 -0700 Subject: [PATCH] Use upstream openlibm, goblin --- .gitmodules | 4 ++-- Cargo.toml | 2 +- Makefile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 3335d1a..57d3758 100644 --- a/.gitmodules +++ b/.gitmodules @@ -49,9 +49,9 @@ [submodule "crates/docgen"] path = crates/docgen url = https://github.com/redox-os/docgen.git -[submodule "libstd_real/openlibm"] +[submodule "libstd/openlibm"] path = libstd/openlibm - url = https://github.com/redox-os/openlibm.git + url = https://github.com/JuliaLang/openlibm.git [submodule "programs/binutils"] path = programs/binutils url = https://github.com/redox-os/binutils.git diff --git a/Cargo.toml b/Cargo.toml index 95e2c73..5c3c138 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ spin = "*" redox_syscall = { path = "syscall/" } [dependencies.goblin] -git = "https://github.com/redox-os/goblin.git" +git = "https://github.com/m4b/goblin.git" default-features = false features = ["elf32", "elf64"] diff --git a/Makefile b/Makefile index 8d1995c..93e2825 100644 --- a/Makefile +++ b/Makefile @@ -358,7 +358,7 @@ $(BUILD)/libstd_unicode.rlib: rust/src/libstd_unicode/lib.rs $(BUILD)/libcore.rl $(RUSTC) $(RUSTCFLAGS) -o $@ $< libstd/openlibm/libopenlibm.a: - CROSSCC=$(CC) CFLAGS=-fno-stack-protector make -C libstd/openlibm libopenlibm.a + CFLAGS=-fno-stack-protector make -C libstd/openlibm libopenlibm.a $(BUILD)/libopenlibm.a: libstd/openlibm/libopenlibm.a mkdir -p $(BUILD)