From 030d0eb58f0fae4201afcb83a38ac70038393b8d Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Sun, 4 Nov 2018 08:38:32 -0600 Subject: [PATCH] jam: Fix bootstrap via absolutes in LD_LIBRARY_PATH * The PWD's are live based on jam run location which means they shouldn't bind the generated directory to a fixed path as before. * We also need an absolute LD_LIBRARY PATH since haikuporter loses the context invoking host tools. * I don't think we can run jam from outside of the generated directory anymore... but I don't think that was a thing. Change-Id: I020f902ce5235bf268c9075d6e2ae85296a4ad20 --- build/jam/BuildSetup | 3 ++- build/jam/RepositoryRules | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup index c859359d05..e33fc54acd 100644 --- a/build/jam/BuildSetup +++ b/build/jam/BuildSetup @@ -400,7 +400,8 @@ HOST_DEFINES += ARCH_$(HOST_CPU) ; HOST_DEFINES += _NO_INLINE_ASM __NO_INLINE__ ; # for builds of tools in the current environment -HOST_BUILD_COMPATIBILITY_LIB_DIR = [ FDirName $(HOST_OBJECT_BASE_DIR) lib ] ; +# haikuporter bootstrap needs absolute here vs HOST_OBJECT_BASE_DIR (relative) +HOST_BUILD_COMPATIBILITY_LIB_DIR = [ FDirName $(PWD) lib ] ; # For the generic attributes emulation: Target rm_attrs -- rm replacement that # also removes the attributes. diff --git a/build/jam/RepositoryRules b/build/jam/RepositoryRules index 8db5d7e8e1..52a7563fac 100644 --- a/build/jam/RepositoryRules +++ b/build/jam/RepositoryRules @@ -379,9 +379,9 @@ TREE_PATH="$(HAIKU_REPOSITORY_TREE_PATH)" TARGET_ARCHITECTURE="$(HAIKU_PACKAGING_ARCH)" DOWNLOAD_IN_PORT_DIRECTORY="yes" -PACKAGE_COMMAND="$(2[1])" -MIMESET_COMMAND="$(2[2])" -SYSTEM_MIME_DB="$(2[3])" +PACKAGE_COMMAND="$(PWD)/$(2[1])" +MIMESET_COMMAND="$(PWD)/$(2[2])" +SYSTEM_MIME_DB="$(PWD)/$(2[3])" LICENSES_DIRECTORY="$(HAIKU_ABSOLUTE_TOP)/data/system/data/licenses" OUTPUT_DIRECTORY="$(HAIKU_REPOSITORY_BUILD_DIRECTORY)" EOF