From 19f94028f6014c9c0867f7efa581bb48058b4883 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Sat, 12 Oct 2013 16:01:02 +0200
Subject: [PATCH] Revert "Allow stripping binaries when copying to image
 containers"

This reverts commit d6de84de6690d076caf2744ba3fda17ef267cabd.
---
 build/jam/BuildSetup             |  2 --
 build/jam/ImageRules             | 14 --------------
 build/jam/images/FloppyBootImage |  1 -
 3 files changed, 17 deletions(-)

diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index c1ec3b3bc0..f07fb103a8 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -46,8 +46,6 @@ HAIKU_INSTALL_TARGETS_VAR on $(HAIKU_FLOPPY_BOOT_IMAGE_CONTAINER_NAME)
 	= HAIKU_FLOPPY_BOOT_IMAGE_INSTALL_TARGETS ;
 HAIKU_CONTAINER_SYSTEM_DIR_TOKENS on $(HAIKU_FLOPPY_BOOT_IMAGE_CONTAINER_NAME)
 	= system ;
-#HAIKU_CONTAINER_STRIP_BINARIES on $(HAIKU_FLOPPY_BOOT_IMAGE_CONTAINER_NAME)
-#	= 1 ;
 
 # boot CD image
 HAIKU_CD_BOOT_IMAGE_CONTAINER_NAME = haiku-boot-cd-container ;
diff --git a/build/jam/ImageRules b/build/jam/ImageRules
index 631bf6dda2..172a766537 100644
--- a/build/jam/ImageRules
+++ b/build/jam/ImageRules
@@ -692,8 +692,6 @@ rule CreateContainerCopyFilesScript container : script
 				local dummyTarget = $(script)-dummy-$(dir:G=)-$(target) ;
 				NotFile $(dummyTarget) ;
 				TARGET_DIR on $(dummyTarget) = $(dir:G=) ;
-				DO_STRIP on $(dummyTarget) = [ on $(container)
-					return $(HAIKU_CONTAINER_STRIP_BINARIES) ] ;
 
 				local nameFunction
 					= [ on $(destTarget) return $(NAME_FUNCTION) ] ;
@@ -723,8 +721,6 @@ rule CreateContainerCopyFilesScript container : script
 			local dummyTarget = $(script)-dummy-$(dir:G=) ;
 			NotFile $(dummyTarget) ;
 			TARGET_DIR on $(dummyTarget) = $(dir:G=) ;
-			DO_STRIP on $(dummyTarget) = [ on $(container)
-				return $(HAIKU_CONTAINER_STRIP_BINARIES) ] ;
 
 			Depends $(dummyTarget) : $(initScript) $(targets)
 				$(serializationDependency) ;
@@ -767,11 +763,6 @@ actions piecemeal AppendToContainerCopyFilesScript bind OUTPUT_SCRIPT
 {
 	echo \$cp "\"\${sPrefix}$(2)\"" "\"\${tPrefix}$(TARGET_DIR)\"" \
 		>> $(OUTPUT_SCRIPT)
-
-	if [ -n "$(DO_STRIP:E)" ]; then
-		echo \$strip "\"\${tPrefix}$(TARGET_DIR)/$(2:BS)\"" "2>/dev/null" \
-			"|| true" >> $(OUTPUT_SCRIPT)
-	fi
 }
 
 
@@ -784,11 +775,6 @@ actions AppendToContainerCopyFilesScriptSingleFile
 
 	echo \$cp "\"\${sPrefix}$(2[2])\"" \
 		"\"\${tPrefix}$(TARGET_DIR)/$(INSTALL_TARGET_NAME)\"" >> $(2[1])
-
-	if [ -n "$(DO_STRIP:E)" ]; then
-		echo \$strip "\"\${tPrefix}$(TARGET_DIR)/$(INSTALL_TARGET_NAME)\"" \
-			"2>/dev/null" "|| true" >> $(2[1])
-	fi
 }
 
 
diff --git a/build/jam/images/FloppyBootImage b/build/jam/images/FloppyBootImage
index 61c16ff888..b44f1ee2d6 100644
--- a/build/jam/images/FloppyBootImage
+++ b/build/jam/images/FloppyBootImage
@@ -183,7 +183,6 @@ AddVariableToScript $(script) : tmpDir : $(HAIKU_TMP_DIR) ;
 AddVariableToScript $(script) : addBuildCompatibilityLibDir
 	: $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ;
 AddTargetVariableToScript $(script) : <build>copyattr ;
-AddTargetVariableToScript $(script) : $(HAIKU_STRIP_$(TARGET_ARCH)) : strip ;
 
 # create the other scripts
 local makeDirsScript = <FloppyBootArchive>haiku-floppyboot-make-dirs ;