Only one way of building the XCC now
authorKevin Klues <klueska@cs.berkeley.edu>
Tue, 2 Dec 2014 22:10:37 +0000 (14:10 -0800)
committerBarret Rhoden <brho@cs.berkeley.edu>
Wed, 31 Dec 2014 18:03:08 +0000 (13:03 -0500)
Makefile

index 5789fcf..df49721 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -311,15 +311,8 @@ gcc-lib := $(shell $(CC) -print-libgcc-file-name 2>/dev/null)
 NOSTDINC_FLAGS += -nostdinc -isystem \
                   $(shell $(CC) -print-file-name=include 2>/dev/null)
 XCC_TARGET_ROOT := $(shell $(CC) --print-sysroot 2> /dev/null)
-ifeq ($(XCC_TARGET_ROOT),)
-       XCC_TARGET_ROOT := $(dir $(shell which $(CC) 2> \
-                           /dev/null))../$(patsubst %-,%, $(CROSS_COMPILE))
-       XCC_TARGET_LIB := $(XCC_TARGET_ROOT)/lib/
-       XCC_TARGET_INCLUDE := $(XCC_TARGET_ROOT)/sys-include/
-else
-       XCC_TARGET_LIB := $(XCC_TARGET_ROOT)/usr/lib/
-       XCC_TARGET_INCLUDE := $(XCC_TARGET_ROOT)/usr/include/
-endif
+XCC_TARGET_LIB := $(XCC_TARGET_ROOT)/usr/lib/
+XCC_TARGET_INCLUDE := $(XCC_TARGET_ROOT)/usr/include/
 
 CFLAGS_KERNEL += -O2 -pipe -MD
 CFLAGS_KERNEL += -std=gnu99 -fgnu89-inline