From 1e7d60e45139dbe78d621564cb3cf5ba18530165 Mon Sep 17 00:00:00 2001 From: "henrike@webrtc.org" Date: Tue, 29 Jul 2014 04:45:23 +0000 Subject: [PATCH] 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@6793 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/build/merge_libs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webrtc/build/merge_libs.py b/webrtc/build/merge_libs.py index ba98fc618b..84904d61ce 100644 --- a/webrtc/build/merge_libs.py +++ b/webrtc/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