xdctools: fix toolchain hardcoded paths

Signed-off-by: Enrico Butera <ebutera@users.berlios.de>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

2 files changed, 23 insertions, 0 deletions

diff --git a/recipes-ti/devtools/ti-xdctools/fix-hardcoded-paths.diff b/recipes-ti/devtools/ti-xdctools/fix-hardcoded-paths.diff
new file mode 100644
index 00000000..36142c47
--- /dev/null
+++ b/recipes-ti/devtools/ti-xdctools/fix-hardcoded-paths.diff
@@ -0,0 +1,21 @@
+diff -ur a/packages/gnu/targets/ITarget.xs b/packages/gnu/targets/ITarget.xs
+--- a/packages/gnu/targets/ITarget.xs   2011-08-06 13:24:44.000000000 +0200
++++ b/packages/gnu/targets/ITarget.xs   2011-08-06 13:23:37.000000000 +0200
+@@ -251,7 +251,7 @@
+ 
+     function askLd(target)
+     {
+-        var ldCmd = target.rootDir + "/" + target.GCCTARG + "/bin/ld";
++        var ldCmd = target.rootDir + "/" + target.GCCTARG + "-ld";
+         /* If the ld executable cannot be found, and the prefix is not used,
+          * it's probably a misspelled directory path.
+          */
+@@ -486,7 +486,7 @@
+     tool2cmd["link"] = cmd;
+ 
+     /* define the ar command template */
+-    cmd  = prefix + target.ar.cmd
++    cmd  = prefix + target.GCCTARG + "-ar"
+         + " $(AROPTS_P) " + target.ar.opts
+         + " $@ $(AROPTS_S) $(aropts) $(files)";
+     tool2cmd["ar"] = cmd;
diff --git a/recipes-ti/devtools/ti-xdctools_3.20.06.81.bb b/recipes-ti/devtools/ti-xdctools_3.20.06.81.bb
index 110ee356..45bedaab 100644
--- a/recipes-ti/devtools/ti-xdctools_3.20.06.81.bb
+++ b/recipes-ti/devtools/ti-xdctools_3.20.06.81.bb
@@ -5,6 +5,8 @@ PV = "3_20_06_81"
 # This fixes c6accel, but breaks codec-engine and lpm
 #SRC_URI += "file://arm-linker-hack.diff"
 
+SRC_URI += "file://fix-hardcoded-paths.diff"
+
 SRC_URI[xdcbin.md5sum] = "65151268d6be6ad6eb940ef7ed03af16"
 SRC_URI[xdcbin.sha256sum] = "8ea6b851521ce41fe0b4a349b2d922af7e70f48c50ad9fd21f62627446a834f8"