diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-10-22 10:40:27 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-10-22 10:40:27 -0400 |
| commit | f58857824e71edc39d98180e7750aee9ff1d780e (patch) | |
| tree | 33152063f85ad79cfe6faa555ee1fcae6b9417e1 /indra/newview/viewer_manifest.py | |
| parent | 0dce9862d20bf691d97114fc977521a499824569 (diff) | |
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.
Diffstat (limited to 'indra/newview/viewer_manifest.py')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 7f3a56425c..231a8e21a5 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -582,11 +582,11 @@ class DarwinManifest(ViewerManifest): "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)} ) |