From 657081f3c6c6f7974a8c0f69bc4c715a096497c1 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Sat, 3 Nov 2018 09:43:34 -0500 Subject: [PATCH] bootstrap: Fix bootstrap after HAIKU_TOP changes * haikuporter's cwd is the haikuporter path during execution (haikuporter/HaikuPorter) * We have to pass the full working path and can't use a relative path here * Seems to fix the bootstrap build Change-Id: Ibb139f164c5e08eda3a08136c4e9ea2c9eaeae9e --- build/jam/RepositoryRules | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build/jam/RepositoryRules b/build/jam/RepositoryRules index 21be97aa2f..8db5d7e8e1 100644 --- a/build/jam/RepositoryRules +++ b/build/jam/RepositoryRules @@ -382,7 +382,7 @@ DOWNLOAD_IN_PORT_DIRECTORY="yes" PACKAGE_COMMAND="$(2[1])" MIMESET_COMMAND="$(2[2])" SYSTEM_MIME_DB="$(2[3])" -LICENSES_DIRECTORY="$(HAIKU_TOP)/data/system/data/licenses" +LICENSES_DIRECTORY="$(HAIKU_ABSOLUTE_TOP)/data/system/data/licenses" OUTPUT_DIRECTORY="$(HAIKU_REPOSITORY_BUILD_DIRECTORY)" EOF @@ -463,7 +463,9 @@ rule BootstrapPackageRepository repository : architecture = haiku_cross_devel_sysroot_$(crossDevelPackageSuffixes).hpkg ; # prepare the config file for the HaikuPorts cross build + # This path needs to be absolute due to haikuporter's cwd local outputDir = [ FDirName + $(PWD) $(HAIKU_PACKAGE_REPOSITORIES_DIR_$(architecture)) $(repository:G=)-build ] ; local configFile = haikuports.conf ;