[haiku-commits] BRANCH mmadia-github.separate-build-environment - src/build/libroot build/jam
- From: mmadia-github.separate-build-environment <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 8 Aug 2012 15:49:32 +0200 (CEST)
added 2 changesets to branch
'refs/remotes/mmadia-github/separate-build-environment'
old head: 4b515e72ebd17a6536dd014d73a7292a0bacf8fa
new head: 6f73a76669449715c0b012548088caa26f578e93
----------------------------------------------------------------------------
a2c941c: Move then inclusion of HAIKU_BUILD_OUTPUT_DIR to HOST_HDRS.
6f73a76: Prefix syscalls.h. Removed comments.
[ Matt Madia <mattmadia@xxxxxxxxx> ]
----------------------------------------------------------------------------
5 files changed, 5 insertions(+), 11 deletions(-)
build/jam/BuildSetup | 2 ++
src/build/libroot/Jamfile | 3 ---
src/build/libroot/fs.cpp | 3 +--
src/build/libroot/fs_attr_generic.cpp | 4 +---
src/build/libroot/fs_attr_untyped.cpp | 4 +---
############################################################################
Commit: a2c941ce271a2bdcc217067fa25be14fb42c7923
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Wed Aug 8 09:17:11 2012 UTC
Move then inclusion of HAIKU_BUILD_OUTPUT_DIR to HOST_HDRS.
----------------------------------------------------------------------------
diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index 70228a8..a891dca 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -938,6 +938,8 @@ if $(HOST_PLATFORM) in r5 bone dano {
HOST_HDRS += [ FDirName $(HAIKU_TOP) headers build host beos_common ] ;
}
+# Add directory with generated HaikuHostBuildConfig.h
+HOST_HDRS += [ FDirName $(HAIKU_BUILD_OUTPUT_DIR) ] ;
#pragma mark -
diff --git a/src/build/libroot/Jamfile b/src/build/libroot/Jamfile
index 5c65448..c50eaf4 100644
--- a/src/build/libroot/Jamfile
+++ b/src/build/libroot/Jamfile
@@ -10,9 +10,6 @@ UseHeaders [ FDirName $(HAIKU_TOP) headers build os_target
storage ] : true ;
UseHeaders [ FDirName $(HAIKU_TOP) headers build os_target support ] : true ;
UseHeaders [ FDirName $(HAIKU_TOP) headers build posix_target ] : true ;
-# TODO : #8730 -- UseHeaders $(HAIKU_BUILD_OUTPUT_DIR) may need to go elsewhere
-UseHeaders [ FDirName $(HAIKU_BUILD_OUTPUT_DIR) ] : true ;
-
UsePrivateBuildHeaders kernel system ;
{
############################################################################
Commit: 6f73a76669449715c0b012548088caa26f578e93
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Wed Aug 8 09:22:42 2012 UTC
Prefix syscalls.h. Removed comments.
----------------------------------------------------------------------------
diff --git a/src/build/libroot/fs.cpp b/src/build/libroot/fs.cpp
index 9e2ab01..7c909c4 100644
--- a/src/build/libroot/fs.cpp
+++ b/src/build/libroot/fs.cpp
@@ -24,8 +24,7 @@
#include <fs_attr.h>
#include <target_NodeMonitor.h> // for B_STAT_* flags
-// NOTE: #8730 -- does syscalls.h need to be target_syscalls.h?
-#include <syscalls.h>
+#include <target_syscalls.h>
#include "fs_descriptors.h"
#include "NodeRef.h"
diff --git a/src/build/libroot/fs_attr_generic.cpp
b/src/build/libroot/fs_attr_generic.cpp
index dcb47a1..371960f 100644
--- a/src/build/libroot/fs_attr_generic.cpp
+++ b/src/build/libroot/fs_attr_generic.cpp
@@ -1,7 +1,5 @@
-//#include <BeOSBuildCompatibility.h>
-// NOTE: #8730 -- does syscalls.h need to be target_syscalls.h?
-#include <syscalls.h>
+#include <target_syscalls.h>
#include <target_dirent.h>
#include <target_errno.h>
diff --git a/src/build/libroot/fs_attr_untyped.cpp
b/src/build/libroot/fs_attr_untyped.cpp
index 1c07567..457f0d8 100644
--- a/src/build/libroot/fs_attr_untyped.cpp
+++ b/src/build/libroot/fs_attr_untyped.cpp
@@ -17,9 +17,7 @@
# define B_ENTRY_NOT_FOUND ENOENT
# define B_NO_MEMORY ENOMEM
#else
-//# include <BeOSBuildCompatibility.h>
-// NOTE: #8730 -- does syscalls.h need to be target_syscalls.h?
-# include <syscalls.h>
+# include <target_syscalls.h>
# include "fs_impl.h"
# include "fs_descriptors.h"
Other related posts:
- » [haiku-commits] BRANCH mmadia-github.separate-build-environment - src/build/libroot build/jam - mmadia-github . separate-build-environment
