Index: tools/xcw/bin/helenos-bld-config
===================================================================
--- tools/xcw/bin/helenos-bld-config	(revision 3875f1064135338c90e634c95c82359a59d27007)
+++ tools/xcw/bin/helenos-bld-config	(revision 08f1a6d3635e2c0cb486edea301cd03918d24bb8)
@@ -1,5 +1,5 @@
 #!/bin/bash
 #
-# Copyright (c) 2015 Jiri Svoboda
+# Copyright (c) 2018 Jiri Svoboda
 # All rights reserved.
 #
@@ -35,4 +35,5 @@
 MAKEFILE_COMMON="$SRC_ROOT"/Makefile.common
 MAKEFILE_CONFIG="$SRC_ROOT"/Makefile.config
+CONFIG_MK="$SRC_ROOT"/uspace/export/config.mk
 
 # Extract simple 'name = value' variable definition from Makefile
@@ -42,5 +43,6 @@
 	file_name="$2"
 
-	sed -n "s/^$field_name = \\(.*\\)$/\\1/p" "$file_name"
+	sed -n "s/^$field_name \\{0,1\\}= \\{0,1\\}\\(.*\\)$/\\1/p" "$file_name" | \
+	    sed "s/^\"//" | sed "s/\"$//"
 }
 
@@ -54,4 +56,6 @@
 	echo "__${ENDIAN}__"
 	;;
+*.--cflags) extract_field "HELENOS_CFLAGS" "$CONFIG_MK";;
+*.--ldflags) extract_field "HELENOS_LDFLAGS" "$CONFIG_MK";;
 (*)
 	echo "Unknown option $1" >&2
Index: tools/xcw/bin/helenos-cc
===================================================================
--- tools/xcw/bin/helenos-cc	(revision 3875f1064135338c90e634c95c82359a59d27007)
+++ tools/xcw/bin/helenos-cc	(revision 08f1a6d3635e2c0cb486edea301cd03918d24bb8)
@@ -1,5 +1,5 @@
 #!/bin/bash
 #
-# Copyright (c) 2015 Jiri Svoboda
+# Copyright (c) 2018 Jiri Svoboda
 # All rights reserved.
 #
@@ -36,4 +36,5 @@
 UARCH="$("$XCW"/helenos-bld-config --uarch)"
 CC="$("$XCW"/helenos-bld-config --cc)"
+CFLAGS="$("$XCW"/helenos-bld-config --cflags)"
 ENDIAN="$("$XCW"/helenos-bld-config --endian)"
 
@@ -41,5 +42,5 @@
 "$CC" \
     -O3 -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32LE -finput-charset=UTF-8 \
-    -nostdlib \
+    $CFLAGS \
     -Wall -Wextra -Wno-clobbered -Wno-unused-parameter -Wmissing-prototypes \
     -std=gnu99 -Werror-implicit-function-declaration -Wwrite-strings -ggdb \
Index: tools/xcw/bin/helenos-ld
===================================================================
--- tools/xcw/bin/helenos-ld	(revision 3875f1064135338c90e634c95c82359a59d27007)
+++ tools/xcw/bin/helenos-ld	(revision 08f1a6d3635e2c0cb486edea301cd03918d24bb8)
@@ -1,5 +1,5 @@
 #!/bin/bash
 #
-# Copyright (c) 2015 Jiri Svoboda
+# Copyright (c) 2018 Jiri Svoboda
 # All rights reserved.
 #
@@ -35,10 +35,14 @@
 SRC_ROOT="$XCW/../../.."
 UARCH="$("$XCW"/helenos-bld-config --uarch)"
+CFLAGS="$("$XCW"/helenos-bld-config --cflags)"
+LDFLAGS="$("$XCW"/helenos-bld-config --ldflags)"
 CC="$("$XCW"/helenos-bld-config --cc)"
 
 echo helenos-ld "$@"
 "$CC" \
+    $CFLAGS \
     "$@" \
     "$SRC_ROOT"/uspace/lib/c/crt0.o \
     "$SRC_ROOT"/uspace/lib/c/crt1.o \
-    "$SRC_ROOT"/uspace/lib/c/libc.a
+    "$SRC_ROOT"/uspace/lib/c/libc.a \
+    -lgcc
