diff options
| author | Mark Ferrell <major@homeonderanged.org> | 2014-02-05 07:06:05 -0800 |
|---|---|---|
| committer | Mark Ferrell <major@homeonderanged.org> | 2014-02-05 07:06:05 -0800 |
| commit | d6422952ffbdfa22ecb4c856e366415efa79212f (patch) | |
| tree | 52f395eccfbc75fc8d6fa0e20c88715565acf8e7 | |
| parent | c46b94b454b3510eb930f1cff427f3127f65e59c (diff) | |
Cleanup toolchain environ
* Added various /other/ tools to the --toolchain query which can be prefixed
w/ out CHOST.
* Removed the manual construction of the toolchain environ in the generic
pkg_compile(). This is a hold-over from before we had the --toolchain
query.
| -rwxr-xr-x | builder/build-package | 9 | ||||
| -rwxr-xr-x | builder/build-query | 5 |
2 files changed, 4 insertions, 10 deletions
diff --git a/builder/build-package b/builder/build-package index d5f0808..b98b3e9 100755 --- a/builder/build-package +++ b/builder/build-package @@ -29,15 +29,6 @@ pkg_prep() pkg_compile() { - CC="${CHOST}-gcc" - CXX="${CHOST}-g++" - AS="${CHOST}-as" - LD="${CHOST}-ld" - STRIP="${CHOST}-strip" - RANLIB="${CHOST}-ranlib" - LIBTOOL="${CHOST}-libtool" - export CC CXX AS LD STRIP RANLIB LIBTOOL - # FIXME these defaults need moved elsewhere if [ -f "configure" ]; then ./configure --host="${CHOST}" \ diff --git a/builder/build-query b/builder/build-query index f7a59c3..c0bde3a 100755 --- a/builder/build-query +++ b/builder/build-query @@ -169,7 +169,10 @@ if [ "${QUERY_ACTION}" = "toolchain" ]; then EOF export CC CXX CROSS_COMPILE - for cmd in ld ar strip ranlib; do + # Note: we do not set AS since we often use gcc as the assembler + + for cmd in ar ld strip ranlib autom4te autoconf autoheader automake \ + aclocal autopoint libtool libtoolize; do var="$(echo "${cmd}"|tr '[a-z]' '[A-Z]')" if command -v "${CROSS_COMPILE}${cmd}" > /dev/null 2>&1; then echo "${var}=${CROSS_COMPILE}${cmd}" |