| 1 |
Author: haubi |
| 2 |
Date: 2008-04-21 09:37:29 +0000 (Mon, 21 Apr 2008) |
| 3 |
New Revision: 1624 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/toolchain-prefix-wrapper/ld/create-ldwrapper.in |
| 7 |
Log: |
| 8 |
use env-CC if set, else CC used during build, saved as HOST_CC. |
| 9 |
This works now with arguments passed through CC, although might not work with blanks in path. |
| 10 |
|
| 11 |
Modified: trunk/toolchain-prefix-wrapper/ld/create-ldwrapper.in |
| 12 |
=================================================================== |
| 13 |
--- trunk/toolchain-prefix-wrapper/ld/create-ldwrapper.in 2008-04-21 09:34:50 UTC (rev 1623) |
| 14 |
+++ trunk/toolchain-prefix-wrapper/ld/create-ldwrapper.in 2008-04-21 09:37:29 UTC (rev 1624) |
| 15 |
@@ -7,8 +7,8 @@ |
| 16 |
BPREFIX="@GENTOO_PORTAGE_EPREFIX@" |
| 17 |
CFLAGS="@CFLAGS@" |
| 18 |
HOST_CC="@CC@" |
| 19 |
-HOST="@host_alias@" |
| 20 |
-BUILD="@build_alias@" |
| 21 |
+HOST="@host@" |
| 22 |
+BUILD="@build@" |
| 23 |
|
| 24 |
WRAPPERNAME=ld |
| 25 |
WRAPPERSOURCE= |
| 26 |
@@ -74,18 +74,6 @@ |
| 27 |
|| echo "int DEBUG(void) { return 0; }" |
| 28 |
) > "${ctargetstem}".c || return 1 |
| 29 |
umask ${oldumask} || return 1 |
| 30 |
- local cc=$(type -p "${CC}") |
| 31 |
- [[ -z ${cc} ]] && cc=$(type -p "${HOST_CC}") |
| 32 |
- [[ -z ${cc} ]] && cc=$(type -p "${HOST}-gcc") |
| 33 |
- [[ -z ${cc} ]] && cc=$(type -p "${HOST}-cc") |
| 34 |
- if [[ ${HOST} == ${BUILD} ]]; then |
| 35 |
- [[ -z ${cc} ]] && cc=$(type -p gcc) |
| 36 |
- [[ -z ${cc} ]] && cc=$(type -p cc) |
| 37 |
- fi |
| 38 |
- if [[ -z ${cc} ]]; then |
| 39 |
- echo -n "Cannot find compiler for ${HOST} (try setting CC)" |
| 40 |
- return 1 |
| 41 |
- fi |
| 42 |
|
| 43 |
if [[ -z ${ROOT%/} && ${TARGET} == ${HOST} && ${EPREFIX} == ${BPREFIX} ]]; then |
| 44 |
# currently installed ld-wrapper config may be out-of-date, |
| 45 |
@@ -95,7 +83,7 @@ |
| 46 |
export BINUTILS_CONFIG_LDPLUGINS="${plugins}" |
| 47 |
fi |
| 48 |
rm -f "${OUTPUT}.new" > /dev/null || return 1 |
| 49 |
- "${cc}" ${CFLAGS} -o "${OUTPUT}.new" \ |
| 50 |
+ ${CC:-${HOST_CC}} ${CFLAGS} -o "${OUTPUT}.new" \ |
| 51 |
"${ctargetstem}".c "-I${WRAPPERSOURCE}" \ |
| 52 |
"${WRAPPERSOURCE}/libbinutils-config.a" || return 1 |
| 53 |
[[ ${DEBUG} == yes ]] || rm -f "${ctargetstem}".* || return 1 |
| 54 |
|
| 55 |
-- |
| 56 |
gentoo-commits@l.g.o mailing list |
Archives