diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2017-02-24 10:16:55 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-02-24 10:16:55 +0200 |
| commit | 32dbf36f0e4775bd39fadf27ca978577a739a50a (patch) | |
| tree | c608a9b299a7ca06bce8d18fd0918b8e36a9f4e1 | |
| parent | 5a8993e161f6744fe8a45126e77905a75fea0601 (diff) | |
| download | abuild-32dbf36f0e4775bd39fadf27ca978577a739a50a.tar.gz abuild-32dbf36f0e4775bd39fadf27ca978577a739a50a.tar.bz2 abuild-32dbf36f0e4775bd39fadf27ca978577a739a50a.tar.xz abuild-32dbf36f0e4775bd39fadf27ca978577a739a50a.zip | |
abuild: use BOOTSTRAP to determine if build-base is needed
Just checking the build, host and target triplet is not enough
due to various different combinations used in the early bootstrap.
So use detect specifical bootstrap setting.
| -rw-r--r-- | abuild.in | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -1855,19 +1855,19 @@ calcdeps() { # build and install dependencies builddeps() { - local pkg= i= missing= + local pkg= i= missing= BUILD_BASE= local installed_hostdeps= installed_builddeps= [ -n "$nodeps" ] && return 0 msg "Analyzing dependencies..." - local BUILD_BASE="" - if cross_creating; then - options_has toolchain || BUILD_BASE="build-base-$CTARGET_ARCH" - elif cross_compiling; then - BUILD_BASE="build-base-$CTARGET_ARCH" - else - BUILD_BASE="build-base" - fi + case "$BOOTSTRAP" in + no*) BUILD_BASE="";; + *) if cross_creating || cross_compiling; then + BUILD_BASE="build-base-$CTARGET_ARCH" + else + BUILD_BASE="build-base" + fi + esac calcdeps "$BUILD_BASE" installed_builddeps=$($APK info --installed $builddeps) |