summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoakim Sindholt <opensource@zhasha.com>2017-07-25 10:22:49 +0200
committerJoakim Sindholt <opensource@zhasha.com>2017-07-25 10:22:49 +0200
commit17f6b583fa8add81d09c4a9643ba7574fbe8fc26 (patch)
tree24d61e40f8bd3bf79bd7e98c72ecbe6d998d5b10
parente0a32fbcbfc52502513d18662a02bdfa045fc2e6 (diff)
build-libc: remove arch determination for musl, it will autodetect
-rw-r--r--bin/build-libc.sh25
1 files changed, 3 insertions, 22 deletions
diff --git a/bin/build-libc.sh b/bin/build-libc.sh
index 079a9e5..66912f8 100644
--- a/bin/build-libc.sh
+++ b/bin/build-libc.sh
@@ -14,23 +14,6 @@ Linux)
exit 0
fi
- case "$objtype" in
- spim) MUSLARCH="" ;;
- arm) MUSLARCH="armhf" ;;
- amd64) MUSLARCH="x86_64" ;;
- 386) MUSLARCH="i386" ;;
- power64) MUSLARCH="" ;;
- sparc) MUSLARCH="" ;;
- power) MUSLARCH="" ;;
- mips) MUSLARCH="" ;;
- *) MUSLARCH="" ;;
- esac
-
- if [[ "$MUSLARCH" == "" ]]; then
- echo "unsupported object type $objtype" >&2
- exit 1
- fi
-
(
flock -x 200
@@ -39,13 +22,11 @@ Linux)
if [[ ! -e "$OBJDIR/musl-revision" ||
"$(cat "$OBJDIR/musl-revision")" != "$MUSLREV" ]]; then
. "$DIR/arch.sh"
+ export CC="clang --target=$CLANGARCH -integrated-as"
+ export CFLAGS="-ggdb3 -Os -pipe -fPIE -ftls-model=local-exec -fomit-frame-pointer -fstack-protector-strong"
cd "$SRCDIR/musl" && \
make distclean && \
- CC="clang --target=$CLANGARCH -integrated-as" \
- CFLAGS="-ggdb3 -Os -pipe -fPIE -ftls-model=local-exec -fomit-frame-pointer -fstack-protector-strong" \
- GNUTARGET="$CLANGARCH" ./configure \
- --target="$MUSLARCH" \
- --build="$MUSLARCH" \
+ ./configure \
--prefix="$OBJDIR" \
--disable-shared \
--disable-gcc-wrapper \