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

Follow up to hrev45127

Browse Source 
* check whether HAIKU_STRIP variable is set
* use AddVariableToScript instead of AddTargetVariableToScript
  since $(HAIKU_STRIP) isn't a jam target.
This commit is contained in:
Jerome Duval
2013-01-19 16:12:20 +01:00
parent d5ef3d86d1
commit 058f84c3e1
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildSetup
+5
View File
@@ -300,6 +300,11 @@ switch $(HAIKU_CPU) {
Exit "Currently unsupported target CPU:" $(HAIKU_CPU) ; Exit "Currently unsupported target CPU:" $(HAIKU_CPU) ;
} }
# strip is required
if ! $(HAIKU_STRIP) {
Exit "HAIKU_STRIP not set. Please re-run configure." ;
}
# Include embedded board-specific file. # Include embedded board-specific file.
if $(HAIKU_BOOT_BOARD) { if $(HAIKU_BOOT_BOARD) {
include [ FDirName $(HAIKU_BUILD_RULES_DIR) board $(HAIKU_BOOT_BOARD) include [ FDirName $(HAIKU_BUILD_RULES_DIR) board $(HAIKU_BOOT_BOARD)
build/jam/Haiku64Image
+1 -1
View File
@@ -534,7 +534,7 @@ AddTargetVariableToScript $(script) : <build>rc ;
AddTargetVariableToScript $(script) : <build>resattr ; AddTargetVariableToScript $(script) : <build>resattr ;
AddTargetVariableToScript $(script) : <build>unzip ; AddTargetVariableToScript $(script) : <build>unzip ;
AddTargetVariableToScript $(script) : <build>vmdkimage ; AddTargetVariableToScript $(script) : <build>vmdkimage ;
AddTargetVariableToScript $(script) : $(HAIKU_STRIP) : stripCommand ; AddVariableToScript $(script) : stripCommand : $(HAIKU_STRIP) ;
if $(HOST_RM_ATTRS_TARGET) { if $(HOST_RM_ATTRS_TARGET) {
AddTargetVariableToScript $(script) : $(HOST_RM_ATTRS_TARGET) : rmAttrs ; AddTargetVariableToScript $(script) : $(HOST_RM_ATTRS_TARGET) : rmAttrs ;
} else { } else {
build/jam/HaikuCD
+1 -1
View File
@@ -34,7 +34,7 @@ AddTargetVariableToScript $(script) : <build>rc ;
AddTargetVariableToScript $(script) : <build>resattr ; AddTargetVariableToScript $(script) : <build>resattr ;
AddTargetVariableToScript $(script) : <build>unzip ; AddTargetVariableToScript $(script) : <build>unzip ;
AddTargetVariableToScript $(script) : <build>generate_attribute_stores ; AddTargetVariableToScript $(script) : <build>generate_attribute_stores ;
AddTargetVariableToScript $(script) : $(HAIKU_STRIP) : stripCommand ; AddVariableToScript $(script) : stripCommand : $(HAIKU_STRIP) ;
if $(HOST_RM_ATTRS_TARGET) { if $(HOST_RM_ATTRS_TARGET) {
AddTargetVariableToScript $(script) : $(HOST_RM_ATTRS_TARGET) : rmAttrs ; AddTargetVariableToScript $(script) : $(HOST_RM_ATTRS_TARGET) : rmAttrs ;
} else { } else {
build/jam/HaikuImage
+1 -1
View File
@@ -913,7 +913,7 @@ AddTargetVariableToScript $(script) : <build>rc ;
AddTargetVariableToScript $(script) : <build>resattr ; AddTargetVariableToScript $(script) : <build>resattr ;
AddTargetVariableToScript $(script) : <build>unzip ; AddTargetVariableToScript $(script) : <build>unzip ;
AddTargetVariableToScript $(script) : <build>vmdkimage ; AddTargetVariableToScript $(script) : <build>vmdkimage ;
AddTargetVariableToScript $(script) : $(HAIKU_STRIP) : stripCommand ; AddVariableToScript $(script) : stripCommand : $(HAIKU_STRIP) ;
if $(HOST_RM_ATTRS_TARGET) { if $(HOST_RM_ATTRS_TARGET) {
AddTargetVariableToScript $(script) : $(HOST_RM_ATTRS_TARGET) : rmAttrs ; AddTargetVariableToScript $(script) : $(HOST_RM_ATTRS_TARGET) : rmAttrs ;
} else { } else {