lld::outs() << "\n";
}
-static Optional<std::string> findWithExtension(StringRef base,
- ArrayRef<StringRef> extensions) {
- for (StringRef ext : extensions) {
- Twine location = base + ext;
- if (fs::exists(location))
- return location.str();
+static Optional<std::string>
+findAlongPathsWithExtensions(StringRef name, ArrayRef<StringRef> extensions) {
+ llvm::SmallString<261> base;
+ for (StringRef dir : config->librarySearchPaths) {
+ base = dir;
+ path::append(base, Twine("lib") + name);
+ for (StringRef ext : extensions) {
+ Twine location = base + ext;
+ if (fs::exists(location))
+ return location.str();
+ }
}
return {};
}
static Optional<std::string> findLibrary(StringRef name) {
- llvm::SmallString<261> location;
- for (StringRef dir : config->librarySearchPaths) {
- location = dir;
- path::append(location, Twine("lib") + name);
- if (Optional<std::string> path =
- findWithExtension(location, {".tbd", ".dylib", ".a"}))
- return path;
+ if (config->searchDylibsFirst) {
+ if (Optional<std::string> path =
+ findAlongPathsWithExtensions(name, {".tbd", ".dylib"}))
+ return path;
+ return findAlongPathsWithExtensions(name, {".a"});
}
- return {};
+ return findAlongPathsWithExtensions(name, {".tbd", ".dylib", ".a"});
}
static Optional<std::string> findFramework(StringRef name) {
getLibrarySearchPaths(args, roots, config->librarySearchPaths);
getFrameworkSearchPaths(args, roots, config->frameworkSearchPaths);
+ if (const opt::Arg *arg =
+ args.getLastArg(OPT_search_paths_first, OPT_search_dylibs_first))
+ config->searchDylibsFirst =
+ (arg && arg->getOption().getID() == OPT_search_dylibs_first);
config->forceLoadObjC = args.hasArg(OPT_ObjC);
if (args.hasArg(OPT_v)) {
# REQUIRES: x86
-# RUN: mkdir -p %t
+################ Place dynlib in %tD, and archive in %tA
+# RUN: mkdir -p %t %tA %tD
#
# RUN: llvm-mc -filetype obj -triple x86_64-apple-darwin %p/Inputs/libhello.s -o %t/hello.o
# RUN: lld -flavor darwinnew -dylib -install_name @executable_path/libhello.dylib %t/hello.o -o %t/libhello.dylib
#
# RUN: llvm-mc -filetype obj -triple x86_64-apple-darwin %p/Inputs/libgoodbye.s -o %t/goodbye.o
-# RUN: lld -flavor darwinnew -dylib -install_name @executable_path/libgoodbye.dylib %t/goodbye.o -o %t/libgoodbye.dylib
-# RUN: llvm-ar --format=darwin crs %t/libgoodbye.a %t/goodbye.o
+# RUN: lld -flavor darwinnew -dylib -install_name @executable_path/libgoodbye.dylib %t/goodbye.o -o %tD/libgoodbye.dylib
+# RUN: llvm-ar --format=darwin crs %tA/libgoodbye.a %t/goodbye.o
#
# RUN: llvm-mc -filetype obj -triple x86_64-apple-darwin %s -o %t/test.o
-# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -o %t/test -Z -L%t -lhello -lgoodbye -lSystem %t/test.o
-#
-# RUN: llvm-objdump --macho --dylibs-used %t/test | FileCheck %s
-# CHECK: @executable_path/libhello.dylib
-# CHECK: @executable_path/libgoodbye.dylib
-# CHECK: /usr/lib/libSystem.B.dylib
+################ default, which is the same as -search_paths_first
+# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -o %t/test -Z \
+# RUN: -L%tA -L%tD -L%t -lhello -lgoodbye -lSystem %t/test.o
+# RUN: llvm-objdump --macho --dylibs-used %t/test | FileCheck --check-prefix=ARCHIVE %s
+
+################ Test all permutations of -L%t{A,D} with -search_paths_first
+# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -o %t/test -Z \
+# RUN: -L%tA -L%tD -L%t -lhello -lgoodbye -lSystem %t/test.o -search_paths_first
+# RUN: llvm-objdump --macho --dylibs-used %t/test | FileCheck --check-prefix=ARCHIVE %s
+# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -o %t/test -Z \
+# RUN: -L%tD -L%tA -L%t -lhello -lgoodbye -lSystem %t/test.o -search_paths_first
+# RUN: llvm-objdump --macho --dylibs-used %t/test | FileCheck --check-prefix=DYLIB %s
+# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -o %t/test -Z \
+# RUN: -L%tA -L%t -lhello -lgoodbye -lSystem %t/test.o -search_paths_first
+# RUN: llvm-objdump --macho --dylibs-used %t/test | FileCheck --check-prefix=ARCHIVE %s
+# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -o %t/test -Z \
+# RUN: -L%tD -L%t -lhello -lgoodbye -lSystem %t/test.o -search_paths_first
+# RUN: llvm-objdump --macho --dylibs-used %t/test | FileCheck --check-prefix=DYLIB %s
+
+################ Test all permutations of -L%t{A,D} with -search_dylibs_first
+# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -o %t/test -Z \
+# RUN: -L%tA -L%tD -L%t -lhello -lgoodbye -lSystem %t/test.o -search_dylibs_first
+# RUN: llvm-objdump --macho --dylibs-used %t/test | FileCheck --check-prefix=DYLIB %s
+# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -o %t/test -Z \
+# RUN: -L%tD -L%tA -L%t -lhello -lgoodbye -lSystem %t/test.o -search_dylibs_first
+# RUN: llvm-objdump --macho --dylibs-used %t/test | FileCheck --check-prefix=DYLIB %s
+# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -o %t/test -Z \
+# RUN: -L%tA -L%t -lhello -lgoodbye -lSystem %t/test.o -search_dylibs_first
+# RUN: llvm-objdump --macho --dylibs-used %t/test | FileCheck --check-prefix=ARCHIVE %s
+# RUN: lld -flavor darwinnew -L%S/Inputs/MacOSX.sdk/usr/lib -o %t/test -Z \
+# RUN: -L%tD -L%t -lhello -lgoodbye -lSystem %t/test.o -search_dylibs_first
+# RUN: llvm-objdump --macho --dylibs-used %t/test | FileCheck --check-prefix=DYLIB %s
+
+# DYLIB: @executable_path/libhello.dylib
+# DYLIB: @executable_path/libgoodbye.dylib
+# DYLIB: /usr/lib/libSystem.B.dylib
+
+# ARCHIVE: @executable_path/libhello.dylib
+# ARCHIVE-NOT: @executable_path/libgoodbye.dylib
+# ARCHIVE: /usr/lib/libSystem.B.dylib
.section __TEXT,__text
.global _main