Verified Commit 15aa52a8 authored by jD91mZM2's avatar jD91mZM2

Fix the CI; Disregard last commit

The race condition didn't trigger when I tested it, so I assumed I had
solved it...
parent 123031dc
Pipeline #4137 passed with stages
in 14 minutes and 43 seconds
......@@ -45,6 +45,8 @@ build:redox:
- export XARGO_RUST_SRC="$PWD/rust/src"
# Main script
- make -j `nproc` headers
- make -j `nproc` install-headers DESTDIR="$PWD/prefix/$TARGET"
- make -j `nproc` all
test:linux:
......
......@@ -27,12 +27,11 @@ SRC=\
src/* \
src/*/* \
src/*/*/* \
src/*/*/*/* \
headers # Used by compiler-builtins
src/*/*/*/*
.PHONY: all clean fmt headers install install-headers libs test
all: headers libs
all: | headers libs
clean:
$(CARGO) clean
......@@ -180,7 +179,7 @@ $(BUILD)/include: $(SRC)
mv $@.partial $@
touch $@
$(BUILD)/openlibm: openlibm headers
$(BUILD)/openlibm: openlibm
rm -rf $@ $@.partial
mkdir -p $(BUILD)
cp -r $< $@.partial
......@@ -190,7 +189,7 @@ $(BUILD)/openlibm: openlibm headers
$(BUILD)/openlibm/libopenlibm.a: $(BUILD)/openlibm $(BUILD)/include
$(MAKE) CC=$(CC) CPPFLAGS="-fno-stack-protector -I$(shell pwd)/include -I $(shell pwd)/$(BUILD)/include" -C $< libopenlibm.a
$(BUILD)/pthreads-emb: pthreads-emb headers
$(BUILD)/pthreads-emb: pthreads-emb
rm -rf $@ $@.partial
mkdir -p $(BUILD)
cp -r $< $@.partial
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment