Index: boot/Makefile.build
===================================================================
--- boot/Makefile.build	(revision 9e40355e27190e4ad773852c97a87d91012aba10)
+++ boot/Makefile.build	(revision bf85e56c7095e7c326a3411862e8cfe45fe52b80)
@@ -52,5 +52,5 @@
 	-Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \
 	-Werror-implicit-function-declaration -Wwrite-strings \
-	-pipe -arch $(CLANG_ARCH)
+	-pipe
 
 ifeq ($(CONFIG_DEBUG),y)
Index: kernel/arch/abs32le/Makefile.inc
===================================================================
--- kernel/arch/abs32le/Makefile.inc	(revision 9e40355e27190e4ad773852c97a87d91012aba10)
+++ kernel/arch/abs32le/Makefile.inc	(revision bf85e56c7095e7c326a3411862e8cfe45fe52b80)
@@ -39,8 +39,4 @@
 endif
 
-ifeq ($(COMPILER),clang)
-	CLANG_ARCH = i386
-endif
-
 BITS = 32
 ENDIANESS = LE
Index: kernel/arch/amd64/Makefile.inc
===================================================================
--- kernel/arch/amd64/Makefile.inc	(revision 9e40355e27190e4ad773852c97a87d91012aba10)
+++ kernel/arch/amd64/Makefile.inc	(revision bf85e56c7095e7c326a3411862e8cfe45fe52b80)
@@ -30,5 +30,4 @@
 BFD_ARCH = i386:x86-64
 BFD = binary
-CLANG_ARCH = x86_64
 CLANG_TARGET = x86_64-unknown-linux
 
Index: kernel/arch/ia32/Makefile.inc
===================================================================
--- kernel/arch/ia32/Makefile.inc	(revision 9e40355e27190e4ad773852c97a87d91012aba10)
+++ kernel/arch/ia32/Makefile.inc	(revision bf85e56c7095e7c326a3411862e8cfe45fe52b80)
@@ -30,5 +30,4 @@
 BFD_ARCH = i386
 BFD = binary
-CLANG_ARCH = i386
 CLANG_TARGET = i386-unknown-linux
 
Index: uspace/lib/c/arch/abs32le/Makefile.common
===================================================================
--- uspace/lib/c/arch/abs32le/Makefile.common	(revision 9e40355e27190e4ad773852c97a87d91012aba10)
+++ uspace/lib/c/arch/abs32le/Makefile.common	(revision bf85e56c7095e7c326a3411862e8cfe45fe52b80)
@@ -27,7 +27,3 @@
 #
 
-ifeq ($(COMPILER),clang)
-	CLANG_ARCH = i386
-endif
-
 ENDIANESS = LE
Index: uspace/lib/c/arch/amd64/Makefile.common
===================================================================
--- uspace/lib/c/arch/amd64/Makefile.common	(revision 9e40355e27190e4ad773852c97a87d91012aba10)
+++ uspace/lib/c/arch/amd64/Makefile.common	(revision bf85e56c7095e7c326a3411862e8cfe45fe52b80)
@@ -27,5 +27,4 @@
 #
 
-CLANG_ARCH = x86_64
 CLANG_TARGET = x86_64-unknown-linux
 GCC_CFLAGS += -fno-omit-frame-pointer
Index: uspace/lib/c/arch/ia32/Makefile.common
===================================================================
--- uspace/lib/c/arch/ia32/Makefile.common	(revision 9e40355e27190e4ad773852c97a87d91012aba10)
+++ uspace/lib/c/arch/ia32/Makefile.common	(revision bf85e56c7095e7c326a3411862e8cfe45fe52b80)
@@ -27,5 +27,4 @@
 #
 
-CLANG_ARCH = i386
 CLANG_TARGET = i386-unknown-linux