Index: tools/xcw/bin/helenos-ld
===================================================================
--- tools/xcw/bin/helenos-ld	(revision a5c468e1202a50cf26350e4a4d16303bc7323265)
+++ tools/xcw/bin/helenos-ld	(revision 3083c74366b45eb365556e15d8161f5a75b3fc54)
@@ -34,4 +34,7 @@
 XCW="$(dirname "$0")"
 SRC_ROOT="$XCW/../../.."
+if [ -z "$EXPORT_DIR" ]; then
+	EXPORT_DIR="$SRC_ROOT/uspace/export"
+fi
 UARCH="$("$XCW"/helenos-bld-config --uarch)"
 CFLAGS="$("$XCW"/helenos-bld-config --cflags)"
@@ -43,6 +46,6 @@
     $CFLAGS \
     "$@" \
-    "$SRC_ROOT"/uspace/lib/c/crt0.o \
-    "$SRC_ROOT"/uspace/lib/c/crt1.o \
-    "$SRC_ROOT"/uspace/lib/c/libc.a \
+    "$EXPORT_DIR"/lib/crt0.o \
+    "$EXPORT_DIR"/lib/crt1.o \
+    "$EXPORT_DIR"/lib/libc.a \
     -lgcc