hrev51911 adds 1 changeset to branch 'master'
old head: fe11711026bb1bb38d2de97237d89398184cde34
new head: 1894e9b6a78e978e94b2ff73fd0dfb0688aba40c
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=1894e9b6a78e+%5Efe11711026bb
----------------------------------------------------------------------------
1894e9b6a78e: Add runtime_loader in secondary bootstrap packages.
add grist to runtime_loader source files.
Change-Id: I09c58b5cc1d57034632df99b4fb3c80e3ff49e3e
[ Jérôme Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev51911
Commit: 1894e9b6a78e978e94b2ff73fd0dfb0688aba40c
URL: https://git.haiku-os.org/haiku/commit/?id=1894e9b6a78e
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Mon Apr 30 20:29:45 2018 UTC
----------------------------------------------------------------------------
2 files changed, 2 insertions(+), 1 deletion(-)
build/jam/packages/HaikuSecondaryBootstrap | 1 +
src/system/runtime_loader/Jamfile | 2 +-
----------------------------------------------------------------------------
diff --git a/build/jam/packages/HaikuSecondaryBootstrap
b/build/jam/packages/HaikuSecondaryBootstrap
index e911e1a2c6..c51afc376a 100644
--- a/build/jam/packages/HaikuSecondaryBootstrap
+++ b/build/jam/packages/HaikuSecondaryBootstrap
@@ -4,6 +4,7 @@ local architecture = $(TARGET_PACKAGING_ARCH) ;
local haikuPackage = haiku_$(architecture).hpkg ;
HaikuPackage $(haikuPackage) ;
+AddFilesToPackage $(architecture) : <$(architecture)>runtime_loader ;
# libs
AddLibrariesToPackage lib $(architecture)
diff --git a/src/system/runtime_loader/Jamfile
b/src/system/runtime_loader/Jamfile
index 71a80b2215..5476f5da01 100644
--- a/src/system/runtime_loader/Jamfile
+++ b/src/system/runtime_loader/Jamfile
@@ -96,7 +96,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
utility.cpp
;
- Objects $(sources) ;
+ Objects [ FGristFiles $(sources) ] ;
Ld [ MultiArchDefaultGristFiles runtime_loader ] :
[ FGristFiles $(sources:S=$(SUFOBJ)) ]
