summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorhenrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2014-07-29 04:45:23 +0000
committerhenrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2014-07-29 04:45:23 +0000
commitcffc6850c51d73cba5e0e238d72710cfb6b365f8 (patch)
tree2802d5a10a15b806a8b6461743b0e39312aa7e2f /build
parent3ff42227d8b0a7502b3a2071af6c2dc548830ddb (diff)
downloadwebrtc-cffc6850c51d73cba5e0e238d72710cfb6b365f8.tar.gz
merge_libs.py: fixes Windows breakage: there should be no space after "lib /OUT:".
TBR=andrew@webrtc.org BUG=b/15773179 Review URL: https://webrtc-codereview.appspot.com/16999004 git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6793 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'build')
-rw-r--r--build/merge_libs.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/merge_libs.py b/build/merge_libs.py
index ba98fc61..84904d61 100644
--- a/build/merge_libs.py
+++ b/build/merge_libs.py
@@ -78,7 +78,7 @@ def main(argv):
' -and -not -name '.join(IGNORE_PATTERNS) +
' -exec', cmd, output_lib, '{} +'])
else:
- cmd = ' '.join([cmd, output_lib] + FindFiles(search_path, pattern))
+ cmd = ' '.join([cmd + output_lib] + FindFiles(search_path, pattern))
print cmd
subprocess.check_call(cmd, shell=True)
return 0