From 69bd151d32446e7f77cb079431511f71be6f3776 Mon Sep 17 00:00:00 2001 From: waddlesplash Date: Fri, 16 Nov 2018 21:41:43 -0500 Subject: [PATCH] build: Fix paths of tools for bootstrap builds. The paths to tools are relative to cwd, and HAIKU_ABSOLUTE_OUTPUT_DIR is not necessarily the same as that, in the case where jam is invoked from the repository root instead of a "generated" directory. HOST_OBJECT_BASE_DIR is relative to pwd also, so just make it absolute. Change-Id: I2aef83804be31c3c03c8577d56372f2dc6cb77f8 Reviewed-on: https://review.haiku-os.org/718 Reviewed-by: waddlesplash --- build/jam/BuildSetup | 2 +- build/jam/RepositoryRules | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup index 2ad1e8108e..b4939b58c6 100644 --- a/build/jam/BuildSetup +++ b/build/jam/BuildSetup @@ -400,7 +400,7 @@ 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 ] ; +HOST_BUILD_COMPATIBILITY_LIB_DIR = [ FDirName $(PWD) $(HOST_OBJECT_BASE_DIR) 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