Merge pull request #3326 from compnerd/dependent-libs

swift-ci · web-flow · commit a0f1a535442e · 2016-07-06T21:35:01.000-07:00
diff --git a/include/swift/Option/Options.td b/include/swift/Option/Options.td
@@ -272,6 +272,9 @@ def Xlinker : Separate<["-"], "Xlinker">,
   Flags<[DoesNotAffectIncrementalBuild]>,
   HelpText<"Specifies an option which should be passed to the linker">;
 
+def autolink_library : Joined<["-"], "autolink-library=">,
+  HelpText<"Add dependent library">, Flags<[FrontendOption]>;
+
 // Optimization levels
 
 def O_Group : OptionGroup<"<optimization level options>">;
diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
@@ -1285,6 +1285,9 @@ static bool ParseIRGenArgs(IRGenOptions &Opts, ArgList &Args,
     Opts.EnableReflectionNames = false;
   }
 
+  for (const auto &Lib : Args.getAllArgValues(options::OPT_autolink_library))
+    Opts.LinkLibraries.push_back(LinkLibrary(Lib, LibraryKind::Library));
+
   return false;
 }
 
diff --git a/test/IRGen/dependent-library.swift b/test/IRGen/dependent-library.swift
@@ -0,0 +1,7 @@
+// RUN: %swift -target i686-unknown-windows-msvc -emit-ir -parse-as-library -parse-stdlib -module-name dependent -autolink-library=oldnames -autolink-library=msvcrt %s -o - | FileCheck %s
+
+// CHECK: !{i32 6, !"Linker Options", ![[options:[0-9]+]]}
+// CHECK: ![[options]] = !{![[oldnames:[0-9]+]], ![[msvcrtd:[0-9]+]]}
+// CHECK: ![[oldnames]] = !{!"/DEFAULTLIB:oldnames.lib"}
+// CHECK: ![[msvcrtd]] = !{!"/DEFAULTLIB:msvcrt.lib"}
+

Original file line number	Diff line number	Diff line change
`@@ -1285,6 +1285,9 @@ static bool ParseIRGenArgs(IRGenOptions &Opts, ArgList &Args,`
`1285`	`1285`	`Opts.EnableReflectionNames = false;`
`1286`	`1286`	`}`
`1287`	`1287`
	`1288`	`+ for (const auto &Lib : Args.getAllArgValues(options::OPT_autolink_library))`
	`1289`	`+ Opts.LinkLibraries.push_back(LinkLibrary(Lib, LibraryKind::Library));`
	`1290`	`+`
`1288`	`1291`	`return false;`
`1289`	`1292`	`}`
`1290`	`1293`