diff --git a/Makefile b/Makefile
index afb4bca8a4b7c232ef8da1cc21056064b00eb3ab..5213c3c171513166407f5174e168cd7b1d561f93 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 1a5fee268dbe218bebdfee0b8f1c8bca59d016e5..5432f31b58a347eb6213351aa3c1ff2c087c0c7d 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