From 1afba8e474c54939bc6ab92ed57776fd059529a0 Mon Sep 17 00:00:00 2001 From: Mikhail Glushenkov Date: Tue, 23 Feb 2010 09:04:57 +0000 Subject: Implement order-preserving option forwarding. Needed to correctly handle things like 'llvmc -framework Foo foo.o -framework Bar bar.o' - before this commit all '-framework' options would've been grouped together in the beginning. Due to our dependence on CommandLine this turned out to be a giant hack; we will migrate away from CommandLine eventually. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@96922 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CompilerDriver/Tool.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'lib/CompilerDriver/Tool.cpp') diff --git a/lib/CompilerDriver/Tool.cpp b/lib/CompilerDriver/Tool.cpp index 7be24147ce..5e558ca43c 100644 --- a/lib/CompilerDriver/Tool.cpp +++ b/lib/CompilerDriver/Tool.cpp @@ -17,6 +17,8 @@ #include "llvm/ADT/StringExtras.h" #include "llvm/System/Path.h" +#include + using namespace llvm; using namespace llvmc; @@ -72,11 +74,21 @@ sys::Path Tool::OutFilename(const sys::Path& In, return Out; } +namespace { + template + bool CompareFirst (std::pair p1, std::pair p2) { + return std::less()(p1.first, p2.first); + } +} + StrVector Tool::SortArgs(ArgsVector& Args) const { StrVector Out; - for (ArgsVector::iterator B = Args.begin(), E = Args.end(); B != E; ++B) + // HACK: this won't be needed when we'll migrate away from CommandLine. + std::stable_sort(Args.begin(), Args.end(), &CompareFirst); + for (ArgsVector::iterator B = Args.begin(), E = Args.end(); B != E; ++B) { Out.push_back(B->second); + } return Out; } -- cgit v1.2.3-18-g5258