Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jam/HeaderRules: Put posix before gcc 

* After the gcc 8 upgrade, during bootstrap sources attempt to
  load limits.h from gcc before they use our limits.h override
  resulting in undefined NAME_MAX, PATH_MAX, etc.

Change-Id: I9204410d0543a033e262124eaf7bcde09db26aa9
Reviewed-on: https://review.haiku-os.org/c/1498
Reviewed-by: Alex von Gluck IV <kallisti5@unixzen.com>
This commit is contained in:
Alexander von Gluck IV 2019-06-02 21:00:58 -05:00 committed by Alex von Gluck IV
parent b22a59f226
commit 31c38ae2b1
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
build/jam/HeadersRules
View File

@ -460,21 +460,24 @@ rule FStandardHeaders architecture
headers += [ FDirName $(HAIKU_OUTPUT_DIR) clang_headers ] ; headers += [ FDirName $(HAIKU_OUTPUT_DIR) clang_headers ] ;
} }
# Ordering here is important. We fill out things like limits.h and
# gcc only overrides if undefined.
# The c++ headers. # The c++ headers.
headers += [ C++HeaderDirectories $(architecture) ] ; headers += [ C++HeaderDirectories $(architecture) ] ;
# Use glibc headers
headers += [ FDirName $(HAIKU_TOP) headers glibc ] ;
# Use posix headers directory
headers += [ FDirName $(HAIKU_TOP) headers posix ] ;
# The gcc headers. # The gcc headers.
headers += [ GccHeaderDirectories $(architecture) ] ; headers += [ GccHeaderDirectories $(architecture) ] ;
# Use headers directory, to allow to do things like include <posix/string.h> # Use headers directory, to allow to do things like include <posix/string.h>
headers += [ FDirName $(HAIKU_TOP) headers ] ; headers += [ FDirName $(HAIKU_TOP) headers ] ;
# Use posix headers directory
headers += [ FDirName $(HAIKU_TOP) headers posix ] ;
# Use glibc headers
headers += [ FDirName $(HAIKU_TOP) headers glibc ] ;
# Use public OS header directories # Use public OS header directories
headers += [ FDirName $(HAIKU_TOP) headers os ] ; headers += [ FDirName $(HAIKU_TOP) headers os ] ;
headers += [ PublicHeaders $(osIncludes) ] ; headers += [ PublicHeaders $(osIncludes) ] ;