From e1abe809920fb147f2ec120c957779151e6bb91b Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Mon, 26 Mar 2018 19:34:45 -0600
Subject: [PATCH] Fix CI
---
Makefile | 8 ++++++--
ci.sh | 4 +++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index afb4bca8a..5213c3c17 100644
--- a/Makefile
+++ b/Makefile
@@ -14,9 +14,9 @@ ifeq ($(TARGET),x86_64-unknown-redox)
CC="x86_64-unknown-redox-gcc"
endif
-.PHONY: all clean fmt test
+.PHONY: all clean fmt libc test
-all: $(BUILD)/debug/libc.a $(BUILD)/debug/libcrt0.a $(BUILD)/openlibm/libopenlibm.a
+all: libc libm
clean:
cargo clean
@@ -25,6 +25,10 @@ clean:
fmt:
./fmt.sh
+libc: $(BUILD)/debug/libc.a $(BUILD)/debug/libcrt0.a
+
+libm: $(BUILD)/openlibm/libopenlibm.a
+
test: all
make -C tests run
diff --git a/ci.sh b/ci.sh
index 1a5fee268..5432f31b5 100755
--- a/ci.sh
+++ b/ci.sh
@@ -2,8 +2,10 @@
set -ex
./fmt.sh -- --write-mode=diff
-make
if [ -z "$TARGET" ]
then
+ make all
make test
+else
+ make libc
fi
--
GitLab