Revert "Allow stripping binaries when copying to image containers"
This reverts commit d6de84de66.
This commit is contained in:
@@ -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 ;
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -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 ;
|
||||
|
||||
Reference in New Issue
Block a user