From 058f84c3e160eefe9c084ae1a343eeba7afd2b5f Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 19 Jan 2013 16:12:20 +0100
Subject: [PATCH] Follow up to hrev45127

* check whether HAIKU_STRIP variable is set
* use AddVariableToScript instead of AddTargetVariableToScript
  since $(HAIKU_STRIP) isn't a jam target.
---
 build/jam/BuildSetup   | 5 +++++
 build/jam/Haiku64Image | 2 +-
 build/jam/HaikuCD      | 2 +-
 build/jam/HaikuImage   | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index a03fec254e..fe3340f53f 100644
--- 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
index 916e08052e..80ce8c827d 100644
--- 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
index e474296282..1d5a7b7bcb 100644
--- 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
index 9aab5280cc..a90dca68ca 100644
--- 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 {