From ac700d84a91bc059574b26af94923b68523f9478 Mon Sep 17 00:00:00 2001
From: deadwood <deadwood@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Sun, 1 May 2016 14:04:46 +0000
Subject: [PATCH] config: fix build with external compiler by passing the
 sysroot where needed

git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@52712 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 config/conf.cmake.in         | 7 ++++++-
 config/make.tail             | 4 ++--
 tools/collect-aros/mmakefile | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/config/conf.cmake.in b/config/conf.cmake.in
index 977654ce6c..842152faa4 100644
--- a/config/conf.cmake.in
+++ b/config/conf.cmake.in
@@ -17,9 +17,14 @@ SET(CMAKE_FIND_ROOT_PATH @AROS_BUILDDIR@/bin/@aros_target_arch@-@aros_target_cpu
 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-SET(CMAKE_LIBRARY_PATH_FLAG @AROS_BUILDDIR@/bin/@aros_target_arch@-@aros_target_cpu@@aros_target_suffix@/AROS/Development/lib)
 SET(CMAKE_SYSTEM_PROCESSOR @aros_target_cpu@)
 SET(CMAKE_AR @aros_plain_ar@ CACHE FILEPATH "Archiver")
+
+# CMAKE_SYSROOT works only from CMake 3.0, hack below for older versions
+SET(CMAKE_SYSROOT @AROS_BUILDDIR@/bin/@aros_target_arch@-@aros_target_cpu@@aros_target_suffix@/AROS/Development)
+SET(CMAKE_C_FLAGS "--sysroot ${CMAKE_SYSROOT} ${CMAKE_C_FLAGS}" CACHE STRING "" FORCE)
+SET(CMAKE_CXX_FLAGS "--sysroot ${CMAKE_SYSROOT} ${CMAKE_CXX_FLAGS}" CACHE STRING "" FORCE)
+
 IF(NOT CMAKE_C_COMPILER)
   SET(CMAKE_C_COMPILER @aros_target_cc@)
   SET(CMAKE_C_COMPILER_WORKS:INTERNAL TRUE)
diff --git a/config/make.tail b/config/make.tail
index 5b47cedcea..84f21bece5 100644
--- a/config/make.tail
+++ b/config/make.tail
@@ -19,9 +19,9 @@ $(GENMODULE) : $(GENMODULE_DEPS)
 # Disk-based module header
 $(GENDIR)/compiler/libinit/libentry.o : $(SRCDIR)/compiler/libinit/libentry.c
 	@$(ECHO) "Compiling  $<"
-	@$(TARGET_CC) $(SYSROOT_FLAG) -c $(CFLAGS) $< -o $@
+	@$(TARGET_CC) $(TARGET_SYSROOT) -c $(TARGET_CFLAGS) $(CFLAGS) $< -o $@
 
 # Special kickstart module header
 $(GENDIR)/$(KICKSTART_BEGIN).o : $(SRCDIR)/$(KICKSTART_BEGIN).c
 	@$(ECHO) "Compiling  $<"
-	@$(TARGET_CC) $(SYSROOT_FLAG) -c $(CFLAGS) $< -o $@
+	@$(TARGET_CC) $(TARGET_SYSROOT) -c $(TARGET_CFLAGS) $(CFLAGS) $< -o $@
diff --git a/tools/collect-aros/mmakefile b/tools/collect-aros/mmakefile
index 8e797d13f4..8f6ac095b7 100644
--- a/tools/collect-aros/mmakefile
+++ b/tools/collect-aros/mmakefile
@@ -5,7 +5,7 @@
 
 #MM
 development-collect-aros-quick :
-	$(MAKE) HOST_CC="$(TARGET_CC)" HOST_CFLAGS="$(CFLAGS)" \
+	$(MAKE) HOST_CC="$(TARGET_CC) $(TARGET_SYSROOT)" HOST_CFLAGS="$(CFLAGS)" \
 	COLLECT-AROS=$(AROS_DEVELOPMENT)/bin/collect-aros \
 	COLLECT-AROS-BACKEND=backend-bfd.c \
 	USER_CFLAGS="-nix -D_HAVE_LIBIBERTY_ -D_NATIVE_" HOST_LDFLAGS="-L$(GENDIR)/contrib/gnu/binutils/binutils/libiberty -lbfd -liberty -lz"
-- 
2.11.4.GIT