i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace HAIKU_{BOOTSTRAP,MINIMUM}_BUILD with HAIKU_BUILD_TYPE.

Browse Source 
* Instead of separate variables, HAIKU_BUILD_TYPE is set to one of
  'bootstrap', 'minimum' or 'regular'.
* Adjust uses of HAIKU_BOOTSTRAP_BUILD accordingly.
This commit is contained in:
Oliver Tappe
2014-03-22 20:24:07 +01:00
parent 6d8c8a9dfd
commit a8c098a3ba
9 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/PackageRules
+3 -3
View File
@@ -50,7 +50,7 @@ rule PreprocessPackageInfo source : directory : architecture
;
local target = $(source:BSG=package-info)-package-info ;
if $(HAIKU_BOOTSTRAP_BUILD) {
if $(HAIKU_BUILD_TYPE) = bootstrap {
target = $(target)-bootstrap ;
}
MakeLocate $(target) : $(directory) ;
@@ -59,7 +59,7 @@ rule PreprocessPackageInfo source : directory : architecture
: $(secondaryArchitecture) : useCPP ;
# Update requires in the package info.
if ! $(HAIKU_BOOTSTRAP_BUILD) {
if $(HAIKU_BUILD_TYPE) != bootstrap {
local updateRequiresFiles =
<build>update_package_requires
[ on <repository>HaikuPorts return $(HAIKU_REPOSITORY_CACHE_FILE) ]
@@ -99,7 +99,7 @@ rule PreprocessPackageOrRepositoryInfo target : source : architecture
local defines = HAIKU_PACKAGING_ARCH=$(architecture) ;
local sedReplacements = %HAIKU_PACKAGING_ARCH%,$(architecture) ;
if $(HAIKU_BOOTSTRAP_BUILD) {
if $(HAIKU_BUILD_TYPE) = bootstrap {
defines += HAIKU_BOOTSTRAP_BUILD ;
}
if $(secondaryArchitecture) {