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

Revert "jam: Fix bootstrap via absolutes in LD_LIBRARY_PATH"

Browse Source 
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.
This commit is contained in:
Augustin Cavalier 2018-11-04 15:37:31 -05:00
parent 5bd0fbd13a
commit 85f8e70013
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/jam/BuildSetup
View File

@ -400,8 +400,7 @@ 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
# haikuporter bootstrap needs absolute here vs HOST_OBJECT_BASE_DIR (relative) HOST_BUILD_COMPATIBILITY_LIB_DIR = [ FDirName $(HOST_OBJECT_BASE_DIR) lib ] ;
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="$(PWD)/$(2[1])" PACKAGE_COMMAND="$(2[1])"
MIMESET_COMMAND="$(PWD)/$(2[2])" MIMESET_COMMAND="$(2[2])"
SYSTEM_MIME_DB="$(PWD)/$(2[3])" SYSTEM_MIME_DB="$(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