From 85f8e700133d7c4dfe9d9458bc9f53d4dc5074cd Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sun, 4 Nov 2018 15:37:31 -0500 Subject: [PATCH] Revert "jam: Fix bootstrap via absolutes in LD_LIBRARY_PATH" This reverts commit 030d0eb58f0fae4201afcb83a38ac70038393b8d. It is absolutely not correct to assume PWD is the generated dir; it may also be the repository root. Fixes jam putting some build artifacts in the source tree. --- build/jam/BuildSetup | 3 +-- build/jam/RepositoryRules | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup index e33fc54acd..c859359d05 100644 --- a/build/jam/BuildSetup +++ b/build/jam/BuildSetup @@ -400,8 +400,7 @@ HOST_DEFINES += ARCH_$(HOST_CPU) ; HOST_DEFINES += _NO_INLINE_ASM __NO_INLINE__ ; # for builds of tools in the current environment -# haikuporter bootstrap needs absolute here vs HOST_OBJECT_BASE_DIR (relative) -HOST_BUILD_COMPATIBILITY_LIB_DIR = [ FDirName $(PWD) lib ] ; +HOST_BUILD_COMPATIBILITY_LIB_DIR = [ FDirName $(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 52a7563fac..8db5d7e8e1 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="$(PWD)/$(2[1])" -MIMESET_COMMAND="$(PWD)/$(2[2])" -SYSTEM_MIME_DB="$(PWD)/$(2[3])" +PACKAGE_COMMAND="$(2[1])" +MIMESET_COMMAND="$(2[2])" +SYSTEM_MIME_DB="$(2[3])" LICENSES_DIRECTORY="$(HAIKU_ABSOLUTE_TOP)/data/system/data/licenses" OUTPUT_DIRECTORY="$(HAIKU_REPOSITORY_BUILD_DIRECTORY)" EOF