Ignore all cscope files.
[akaros.git] / Makefile
index 5789fcf..db8e54f 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
@@ -585,7 +578,7 @@ utestclean:
 
 # KFS related stuff
 PHONY += fill-kfs unfill-kfs
-XCC_SO_FILES = $(addprefix $(XCC_TARGET_ROOT)/lib/, *.so*)
+XCC_SO_FILES = $(addprefix $(XCC_TARGET_LIB), *.so*)
 
 $(OBJDIR)/.dont-force-fill-kfs:
        $(Q)rm -rf $(addprefix $(FIRST_KFS_PATH)/lib/, $(notdir $(XCC_SO_FILES)))