mirror of
https://github.com/genodelabs/genode.git
synced 2025-06-17 06:38:28 +00:00
Merge final fixes from internal repositories
This commit is contained in:
committed by
Christian Helmuth
parent
6ce4e47c1c
commit
d1891e8a27
@ -13,10 +13,14 @@ HOST_LIB_SEARCH_DIRS := $(shell cc -print-search-dirs | grep libraries |\
|
||||
#
|
||||
# Add search path for 'limits.h'
|
||||
#
|
||||
INC_DIR += $(shell echo "int main() {return 0;}" |\
|
||||
LANG=C $(CXX) -x c++ -v -E - 2>&1 |\
|
||||
sed '/^\#include <\.\.\.> search starts here:/,/^End of search list/!d' |\
|
||||
grep "include-fixed")
|
||||
# We cannot simply extend 'INC_DIR' because this would give precedence to the
|
||||
# host include search paths over Genode search path. The variable HOST_INC_DIR
|
||||
# is appended to the include directory list.
|
||||
#
|
||||
HOST_INC_DIR += $(shell echo "int main() {return 0;}" |\
|
||||
LANG=C $(CXX) -x c++ -v -E - 2>&1 |\
|
||||
sed '/^\#include <\.\.\.> search starts here:/,/^End of search list/!d' |\
|
||||
grep "include-fixed")
|
||||
|
||||
#
|
||||
# Add search paths for normal libraries
|
||||
|
@ -1,6 +1,6 @@
|
||||
INC_DIR += $(dir $(call select_from_repositories,src/platform/linux_syscalls.h))
|
||||
INC_DIR += /usr/include
|
||||
HOST_INC_DIR += $(dir $(call select_from_repositories,src/platform/linux_syscalls.h))
|
||||
HOST_INC_DIR += /usr/include
|
||||
|
||||
# needed for Ubuntu 11.04
|
||||
INC_DIR += /usr/include/i386-linux-gnu
|
||||
INC_DIR += /usr/include/x86_64-linux-gnu
|
||||
HOST_INC_DIR += /usr/include/i386-linux-gnu
|
||||
HOST_INC_DIR += /usr/include/x86_64-linux-gnu
|
||||
|
Reference in New Issue
Block a user