Follow up to hrev45127

* check whether HAIKU_STRIP variable is set * use AddVariableToScript instead of AddTargetVariableToScript since $(HAIKU_STRIP) isn't a jam target.
haiku · Jan 19, 2013 · 058f84c · 058f84c
1 parent d5ef3d8
commit 058f84c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
@@ -300,6 +300,11 @@ switch $(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.
 if $(HAIKU_BOOT_BOARD) {
 	include [ FDirName $(HAIKU_BUILD_RULES_DIR) board $(HAIKU_BOOT_BOARD)

diff --git a/build/jam/Haiku64Image b/build/jam/Haiku64Image
@@ -534,7 +534,7 @@ AddTargetVariableToScript $(script) : <build>rc ;
 AddTargetVariableToScript $(script) : <build>resattr ;
 AddTargetVariableToScript $(script) : <build>unzip ;
 AddTargetVariableToScript $(script) : <build>vmdkimage ;
-AddTargetVariableToScript $(script) : $(HAIKU_STRIP) : stripCommand ;
+AddVariableToScript $(script) : stripCommand : $(HAIKU_STRIP) ;
 if $(HOST_RM_ATTRS_TARGET) {
 	AddTargetVariableToScript $(script) : $(HOST_RM_ATTRS_TARGET) : rmAttrs ;
 } else {

diff --git a/build/jam/HaikuCD b/build/jam/HaikuCD
@@ -34,7 +34,7 @@ AddTargetVariableToScript $(script) : <build>rc ;
 AddTargetVariableToScript $(script) : <build>resattr ;
 AddTargetVariableToScript $(script) : <build>unzip ;
 AddTargetVariableToScript $(script) : <build>generate_attribute_stores ;
-AddTargetVariableToScript $(script) : $(HAIKU_STRIP) : stripCommand ;
+AddVariableToScript $(script) : stripCommand : $(HAIKU_STRIP) ;
 if $(HOST_RM_ATTRS_TARGET) {
 	AddTargetVariableToScript $(script) : $(HOST_RM_ATTRS_TARGET) : rmAttrs ;
 } else {

diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
@@ -913,7 +913,7 @@ AddTargetVariableToScript $(script) : <build>rc ;
 AddTargetVariableToScript $(script) : <build>resattr ;
 AddTargetVariableToScript $(script) : <build>unzip ;
 AddTargetVariableToScript $(script) : <build>vmdkimage ;
-AddTargetVariableToScript $(script) : $(HAIKU_STRIP) : stripCommand ;
+AddVariableToScript $(script) : stripCommand : $(HAIKU_STRIP) ;
 if $(HOST_RM_ATTRS_TARGET) {
 	AddTargetVariableToScript $(script) : $(HOST_RM_ATTRS_TARGET) : rmAttrs ;
 } else {