From 1894e9b6a78e978e94b2ff73fd0dfb0688aba40c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Mon, 30 Apr 2018 22:29:45 +0200 Subject: [PATCH] Add runtime_loader in secondary bootstrap packages. add grist to runtime_loader source files. Change-Id: I09c58b5cc1d57034632df99b4fb3c80e3ff49e3e --- build/jam/packages/HaikuSecondaryBootstrap | 1 + src/system/runtime_loader/Jamfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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)) ]