From 2bbb4223bbcf262a745d718c3083be1d4f69ddf1 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Mon, 6 Dec 2010 17:36:28 -0500 Subject: BUILDFIX linux build broken due to a merge conflicts merge broke the linux build, we were trying to strip a script which is a non-binary file. Restored the correct syntax and build works again. yay! Reviewed by Prep --- indra/newview/viewer_manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 3003617b37..9fc76a09c4 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1035,7 +1035,7 @@ class Linux_i686Manifest(LinuxManifest): if self.args['buildtype'].lower() == 'release' and self.is_packaging_viewer(): print "* Going strip-crazy on the packaged binaries, since this is a RELEASE build" - self.run_command("find %(d)r/bin %(d)r/lib -type f | xargs --no-run-if-empty strip -S" % {'d': self.get_dst_prefix()} ) # makes some small assumptions about our packaged dir structure + self.run_command("find %(d)r/bin %(d)r/lib -type f \\! -name update_install | xargs --no-run-if-empty strip -S" % {'d': self.get_dst_prefix()} ) # makes some small assumptions about our packaged dir structure class Linux_x86_64Manifest(LinuxManifest): -- cgit v1.2.3