summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoakim Sindholt <opensource@zhasha.com>2016-02-16 17:50:31 +0100
committerJoakim Sindholt <opensource@zhasha.com>2016-02-16 17:50:31 +0100
commite3bbc99a5c9ffb7e8b4e3c9722212f2f58e6f9de (patch)
tree096b17747b4409ac05a0e5b8454366b5acdc5fef
parent631cd75e480eca872f71af7a14b3c13f6120ea94 (diff)
update to musl 1.1.13
-rw-r--r--bin/build-libc.sh6
-rw-r--r--mkfile2
m---------src/musl0
3 files changed, 4 insertions, 4 deletions
diff --git a/bin/build-libc.sh b/bin/build-libc.sh
index a6eb22c..68b88ac 100644
--- a/bin/build-libc.sh
+++ b/bin/build-libc.sh
@@ -47,7 +47,7 @@ Linux)
"$(cat "${OBJDIR}/musl-revision")" != "$MUSLREV" ]]
then
cd "${SRCDIR}/musl" && \
- make distclean && \
+ make distclean ARCH=bug && \
CC="clang --target=${CLANGARCH} -integrated-as" \
CFLAGS="-g -Os -pipe -fPIE -ftls-model=local-exec -fstack-protector-all" \
GNUTARGET="${CLANGARCH}" ./configure \
@@ -56,13 +56,13 @@ Linux)
--disable-shared \
--disable-gcc-wrapper \
--enable-visibility && \
- echo 'src/stdio/vfprintf.o: CFLAGS += -fno-inline' >> config.mak && \
+ echo 'obj/src/stdio/vfprintf.o obj/src/stdio/vfprintf.lo: CFLAGS += -fno-inline' >> config.mak && \
make -j${NJOBS} && \
make install && \
echo "${MUSLREV}" > "${OBJDIR}/musl-revision"
if [ ! $? -eq 0 ]; then exit 2; fi
- make distclean
+ make distclean ARCH=bug
fi
if [[ ! -e "$OBJDIR/compiler-rt-revision" ||
diff --git a/mkfile b/mkfile
index 8f74d3e..adcbd47 100644
--- a/mkfile
+++ b/mkfile
@@ -12,5 +12,5 @@ clean:V:
for f in include/*; do
if [ "$f" != "include/u.h" ]; then rm -rf "$f"; fi
done
- (cd src/musl && make distclean >/dev/null)
+ (cd src/musl && make distclean ARCH=bug >/dev/null)
rm -f src/build-lock
diff --git a/src/musl b/src/musl
-Subproject bc0c48414eaba9e974e54aa8ef611b78037fd38
+Subproject 9c102700a7b9e743da692d3cb6bfa580fcdd437