summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2011-08-02 18:49:48 +0159
committerBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2011-08-02 18:49:48 +0159
commit3b23c6691ce51263cac970faaf4db1d93bd86ea6 (patch)
tree340bb237d030ea55788676cd36a0e08e7e4d84ca
parentc8d7c6ee6ae806cac4fc58fba320e1acfb564fe1 (diff)
Revert fix for now, current ld has problems linking u-boot
-rw-r--r--tasks/uboot.mk10
1 files changed, 8 insertions, 2 deletions
diff --git a/tasks/uboot.mk b/tasks/uboot.mk
index 1ee44a3..135d010 100644
--- a/tasks/uboot.mk
+++ b/tasks/uboot.mk
@@ -1,5 +1,11 @@
-TCDIR = $(shell dirname $(TARGET_TOOLS_PREFIX))
-TCPREFIX = $(shell basename $(TARGET_TOOLS_PREFIX))
+TCPREFIX = arm-linux-gnueabi-
+# The 2 lines below (instead of the one above) are actually the right
+# thing to do -- grabbing the toolchain we're meant to use.
+# Unfortunately the current (4.6-2011.07-0-8-2011-07-25_12-42-06-linux-x86)
+# ld fails to link u-boot, so we revert to the old behavior (since it
+# picks up an older, working ld on the build machines) for now.
+#TCDIR = $(shell dirname $(TARGET_TOOLS_PREFIX))
+#TCPREFIX = $(shell basename $(TARGET_TOOLS_PREFIX))
android_uboot:
mkdir -p $(PRODUCT_OUT)/obj/u-boot