* BuildPlatformMain supports overriding HOST_LIBROOT on the target now,
so one can set it to the static libroot, if desired.
* Generic attribute emulation:
- Added build tool rm_attrs, a simple "rm" replacement, which also
removes the attributes directory for a given file.
- Added build/scripts/rm_attrs shell script, which wraps the
invocation of the rm_attrs tool. If it doesn't exist yet, the
ordinary rm is used.
- The RM jam variable refers to the rm_attrs script now, i.e. whenever
something is removed by the build system, the attributes are removed
too (if the build tool has already been built, that is).
- Removed the shell function attrrmrf() in build_haiku_image. We use
the rm_attrs tool instead, if necessary.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24528 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -557,8 +557,9 @@ rule BuildPlatformMain
|
||||
|
||||
# add the build libroot
|
||||
if ! $(HOST_PLATFORM_BEOS_COMPATIBLE) {
|
||||
Depends $(target) : $(HOST_LIBROOT) ;
|
||||
NEEDLIBS on $(target) += $(HOST_LIBROOT) ;
|
||||
local libroot = [ on $(target) return $(HOST_LIBROOT) ] ;
|
||||
Depends $(target) : $(libroot) ;
|
||||
NEEDLIBS on $(target) += $(libroot) ;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -635,15 +636,15 @@ rule BuildPlatformMergeObjectPIC target : sources : otherObjects
|
||||
BuildPlatformMergeObject $(target) : $(sources) : $(otherObjects) ;
|
||||
}
|
||||
|
||||
rule BuildPlatformStaticLibrary
|
||||
rule BuildPlatformStaticLibrary lib : sources : otherObjects
|
||||
{
|
||||
# BuildPlatformStaticLibrary <lib> : <sources> ;
|
||||
# Creates a static library from sources.
|
||||
# <lib>: The library.
|
||||
# <lib>: The static library to be built.
|
||||
# <sources>: List of source files.
|
||||
# <otherObjects>: List of additional object files.
|
||||
#
|
||||
|
||||
local lib = $(1) ;
|
||||
local sources = $(2) ;
|
||||
local objects = [ FGristFiles $(sources:S=$(SUFOBJ)) ] ;
|
||||
|
||||
PLATFORM on $(lib) = host ;
|
||||
@@ -655,6 +656,6 @@ rule BuildPlatformStaticLibrary
|
||||
USES_BE_API on $(objects) = $(usesBeAPI) ;
|
||||
}
|
||||
|
||||
StaticLibrary $(lib) : $(sources) ;
|
||||
StaticLibrary $(lib) : $(sources) : $(otherObjects) ;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user