From f58857824e71edc39d98180e7750aee9ff1d780e Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 22 Oct 2009 10:40:27 -0400
Subject: [PATCH] Fixed Mac build breaker: failing ln -s command.
viewer_manifest.py has acquired new 'ln -s' commands to avoid duplicating
shared .dylib files between the main Second Life app bundle and the embedded
mac-updater and mac-crash-logger app bundles. Unfortunately, the second time
I ran with these new commands, they failed because the target already
existed. Added -f switch to make that case benign.
---
indra/newview/viewer_manifest.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 7f3a56425c8..231a8e21a58 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -582,11 +582,11 @@ def construct(self):
"libaprutil-1.0.3.8.dylib",
"libexpat.0.5.0.dylib"):
target_lib = os.path.join('../../..', libfile)
- self.run_command("ln -s %(target)s '%(link)s'" %
+ self.run_command("ln -sf %(target)s '%(link)s'" %
{'target': target_lib,
'link' : os.path.join(mac_crash_logger_res_path, libfile)}
)
- self.run_command("ln -s %(target)s '%(link)s'" %
+ self.run_command("ln -sf %(target)s '%(link)s'" %
{'target': target_lib,
'link' : os.path.join(mac_updater_res_path, libfile)}
)
--
GitLab