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

jam: Fix bootstrap via absolutes in LD_LIBRARY_PATH

Browse Source 
* 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
This commit is contained in:
Alexander von Gluck IV 2018-11-04 08:38:32 -06:00
parent 9f35df2324
commit 030d0eb58f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/jam/BuildSetup
View File

@ -400,7 +400,8 @@ HOST_DEFINES += ARCH_$(HOST_CPU) ;
HOST_DEFINES += _NO_INLINE_ASM __NO_INLINE__ ; HOST_DEFINES += _NO_INLINE_ASM __NO_INLINE__ ;
# for builds of tools in the current environment # 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 # For the generic attributes emulation: Target rm_attrs -- rm replacement that
# also removes the attributes. # also removes the attributes.

6
build/jam/RepositoryRules
View File

@ -379,9 +379,9 @@ TREE_PATH="$(HAIKU_REPOSITORY_TREE_PATH)"
TARGET_ARCHITECTURE="$(HAIKU_PACKAGING_ARCH)" TARGET_ARCHITECTURE="$(HAIKU_PACKAGING_ARCH)"
DOWNLOAD_IN_PORT_DIRECTORY="yes" DOWNLOAD_IN_PORT_DIRECTORY="yes"
PACKAGE_COMMAND="$(2[1])" PACKAGE_COMMAND="$(PWD)/$(2[1])"
MIMESET_COMMAND="$(2[2])" MIMESET_COMMAND="$(PWD)/$(2[2])"
SYSTEM_MIME_DB="$(2[3])" SYSTEM_MIME_DB="$(PWD)/$(2[3])"
LICENSES_DIRECTORY="$(HAIKU_ABSOLUTE_TOP)/data/system/data/licenses" LICENSES_DIRECTORY="$(HAIKU_ABSOLUTE_TOP)/data/system/data/licenses"
OUTPUT_DIRECTORY="$(HAIKU_REPOSITORY_BUILD_DIRECTORY)" OUTPUT_DIRECTORY="$(HAIKU_REPOSITORY_BUILD_DIRECTORY)"
EOF EOF