Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bootstrap: Fix bootstrap after HAIKU_TOP changes

Browse Source 
* 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
This commit is contained in:
Alexander von Gluck IV 2018-11-03 09:43:34 -05:00
parent e85413ad6c
commit 657081f3c6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/jam/RepositoryRules
View File

@ -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 ;