summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2009-08-02 21:38:37 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2009-08-02 21:38:37 (GMT)
commit33ed1557b64e4449fbb368993f048a8f32678f0f (patch)
tree8fd626dd34353945d11e2619b09983ad3a91ad2a /scripts
parent200c8a2c917e41d9976dc8be846aa23ddde70d6c (diff)
parent7c3dcb42dc4d7f2e3adeb40f954ee94ef1afa7ee (diff)
Merge the queue with all new component versions.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/crosstool-NG.sh.in2
-rw-r--r--scripts/wrapper.in5
2 files changed, 4 insertions, 3 deletions
diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in
index 36c77ba..6382c0a 100644
--- a/scripts/crosstool-NG.sh.in
+++ b/scripts/crosstool-NG.sh.in
@@ -405,7 +405,7 @@ if [ -z "${CT_RESTART}" ]; then
else
case "${tool}" in
# We'll at least need some of them...
- ar|as|gcc|ld|nm|objcopy|objdump|ranlib)
+ ar|as|gcc|g++|ld|nm|objcopy|objdump|ranlib)
CT_Abort "Missing: '${t}${tool}${!s}' or '${t}${tool}' or '${tool}' : either needed!"
;;
# Some are conditionnally required
diff --git a/scripts/wrapper.in b/scripts/wrapper.in
index 6222333..1c501eb 100644
--- a/scripts/wrapper.in
+++ b/scripts/wrapper.in
@@ -1,7 +1,8 @@
#!/bin/sh
-dirname="$(dirname "${0}")"
-basename="$(basename "${0}")"
+canonicalizedname=$(readlink -nm "${0}")
+dirname="$(dirname "${canonicalizedname}")"
+basename="$(basename "${canonicalizedname}")"
ld_lib_path="$(dirname "${dirname}")/lib"