Index: uspace/libc/Makefile.toolchain
===================================================================
--- uspace/libc/Makefile.toolchain	(revision f6d2c81e91d648da1853eee9644638ddc3431847)
+++ uspace/libc/Makefile.toolchain	(revision 7f043c0d4fa344ed23d99c9baa9f11cdac734176)
@@ -41,5 +41,5 @@
 #
 
-ifeq ($(COMPILER),native)
+ifeq ($(COMPILER),gcc_native)
 	CC = gcc
 	AS = as
@@ -48,5 +48,16 @@
 	OBJCOPY = objcopy
 	OBJDUMP = objdump
-else
+endif
+
+ifeq ($(COMPILER),icc_native)
+	CC = icc
+	AS = as
+	LD = ld
+	AR = ar
+	OBJCOPY = objcopy
+	OBJDUMP = objdump
+endif
+
+ifeq ($(COMPILER),gcc_cross)
 	CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
 	AS = $(TOOLCHAIN_DIR)/$(TARGET)-as
Index: uspace/uspace.config
===================================================================
--- uspace/uspace.config	(revision f6d2c81e91d648da1853eee9644638ddc3431847)
+++ uspace/uspace.config	(revision 7f043c0d4fa344ed23d99c9baa9f11cdac734176)
@@ -14,6 +14,7 @@
 
 # Compiler
-@ "cross" Cross-compiler
-@ "native" Native
+@ "gcc_cross" GCC Cross-compiler
+@ "gcc_native" GCC Native
+@ "icc_native" ICC Native
 ! COMPILER (choice)