diff options
-rw-r--r-- | abuild.conf | 8 | ||||
-rw-r--r-- | functions.sh.in | 3 |
2 files changed, 2 insertions, 9 deletions
diff --git a/abuild.conf b/abuild.conf index 1a3af9f..a0d9f0b 100644 --- a/abuild.conf +++ b/abuild.conf @@ -1,11 +1,3 @@ -CHOST=i486-alpine-linux-musl - -# for x86_64 we want: -# CHOST=x86_64-alpine-linux-musl - -# for powerpc we want: -# CHOST=powerpc-alpine-linux-musl - export CFLAGS="-Os -fomit-frame-pointer" export CXXFLAGS="$CFLAGS" export CPPFLAGS="$CFLAGS" diff --git a/functions.sh.in b/functions.sh.in index 1ba2d14..9c0cc57 100644 --- a/functions.sh.in +++ b/functions.sh.in @@ -86,7 +86,8 @@ readconfig() { PACKAGER=${_PACKAGER-$PACKAGER} USE_COLORS=${_USE_COLORS-$USE_COLORS} - [ -z "$CBUILD" ] && CBUILD="$CHOST" + [ -z "$CBUILD" ] && CBUILD="$(gcc -dumpmachine)" + [ -z "$CHOST" ] && CHOST="$CBUILD" [ -z "$CTARGET" ] && CTARGET="$CHOST" [ -z "$CARCH" ] && CARCH="$(hostspec_to_arch $CHOST)" [ -z "$CLIBC" ] && CLIBC="$(hostspec_to_libc $CHOST)" |