--- a/trunk/wharfie/lib/actions.py
+++ b/trunk/wharfie/lib/actions.py
@@ -134,8 +134,8 @@
     myTrgCmd = '''
         apt-get install -y libc6-dev;
         [ -d ./usr/lib/arm-linux-gnueabi*/ ] &&
-            (cd ./usr/lib/arm-linux-gnueabi*/; ln -s crt1.o crt0.o)'''
-    myHostCmd = 'rm .hst.sh; mkdir target; mv ./* target; mkdir host; (cd host; tar -xf ../../debian_toolchain.tar); cp ../debian_toolchain_env.sh env.sh; tar -cf ../' + cmd[1].lstrip() + ' .;'
+            (cd ./usr/lib/arm-linux-gnueabi*/; ln -s crt1.o crt0.o) || true'''
+    myHostCmd = 'files=$(ls -1); mkdir target; mv ${files} target; mkdir host; (cd host; tar -xf ../../debian_toolchain.tar); cp ../debian_toolchain_env.sh env.sh; tar -cf ../' + cmd[1].lstrip() + ' .;'
     dep.append('debian_toolchain.tar')
     dep.append('debian_toolchain_env.sh')
     makeTarget = {