Hahnfeld added a comment. Please adapt the title and summary for the more general changes this has evolved to.
================ Comment at: lib/Driver/Tools.cpp:284 + // If we are not cross-compling, add '-rpath' with architecture-specific + // library path so libraries lined from this path can be automatically + // found. ---------------- s/lined/linked/ ================ Comment at: test/Driver/arch-specific-libdir-rpath.c:6 +// -rpath only gets added during native compilation +// REQUIRES: native +// ---------------- pirama wrote: > pirama wrote: > > I feel this test is fragile. Any idea how to further restrict and require > > that the default target triple has linux and one of i386, x86_64, arm, > > aarch64? > > > > I could create sub-dirs for all archs returned by Triple::getArchTypeName > > (llvm/lib/Support/Triple.cpp) but it seems overkill. > I've restricted the test to just x86_64-linux. Instead of `REQUIRES`, you should probably add `-target x86_64-unknown-linux` ================ Comment at: test/Driver/arch-specific-libdir-rpath.c:18 +// +// CHECK-ARCHDIR: -L{{.*}}/Inputs/resource_dir_with_arch_subdir/lib/linux{{.*}} "-rpath" {{.*}}/Inputs/resource_dir_with_arch_subdir/lib/linux +// CHECK-NO-ARCHDIR-NOT: -L{{.*}}Inputs/resource_dir ---------------- Can you split that into two lines? Then it won't fail if there is some argument added in between https://reviews.llvm.org/D30015 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits