[haiku-commits] haiku: hrev45180 - build/jam

From: korli@xxxxxxxxxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Sat, 19 Jan 2013 16:23:37 +0100 (CET)
hrev45180 adds 1 changeset to branch 'master'
old head: d5ef3d86d15f9f8de7a7795b9ee6e3d91f5ddc85
new head: 058f84c3e160eefe9c084ae1a343eeba7afd2b5f
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=058f84c+%5Ed5ef3d8

----------------------------------------------------------------------------

058f84c: Follow up to hrev45127
  
  * check whether HAIKU_STRIP variable is set
  * use AddVariableToScript instead of AddTargetVariableToScript
    since $(HAIKU_STRIP) isn't a jam target.

                                   [ Jerome Duval <jerome.duval@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev45180
Commit:      058f84c3e160eefe9c084ae1a343eeba7afd2b5f
URL:         http://cgit.haiku-os.org/haiku/commit/?id=058f84c
Author:      Jerome Duval <jerome.duval@xxxxxxxxx>
Date:        Sat Jan 19 15:12:20 2013 UTC

----------------------------------------------------------------------------

4 files changed, 8 insertions(+), 3 deletions(-)
build/jam/BuildSetup   | 5 +++++
build/jam/Haiku64Image | 2 +-
build/jam/HaikuCD      | 2 +-
build/jam/HaikuImage   | 2 +-

----------------------------------------------------------------------------

diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index a03fec2..fe3340f 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 916e080..80ce8c8 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 e474296..1d5a7b7 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 9aab5280..a90dca6 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 {
[haiku-commits] haiku: hrev45180 - build/jam

Other related posts:
