Shorten the help test for -no-canonical-prefixes, put it behind HelpHidden and

claim it in Driver.cpp instead of Tools.cpp.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@90777 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td
index 73dcf2e8615b07d45e69e396f73f13aa1f96bb27..176b10b1a1e347243cc6eb20b47dcf89eee2b07c 100644 (file)
--- a/include/clang/Driver/Options.td
+++ b/include/clang/Driver/Options.td
@@ -424,8 +424,8 @@ def multiply__defined : Separate<"-multiply_defined">;
 def mwarn_nonportable_cfstrings : Flag<"-mwarn-nonportable-cfstrings">, Group<m_Group>;
 def m_Separate : Separate<"-m">, Group<m_Group>;
 def m_Joined : Joined<"-m">, Group<m_Group>;
-def no_canonical_prefixes : Flag<"-no-canonical-prefixes">, Flags<[DriverOption]>,
-  HelpText<"Do not resolve symbolic links, turn relative paths into absolute ones, or do anything else to identify the executable">;
+def no_canonical_prefixes : Flag<"-no-canonical-prefixes">, Flags<[DriverOption, HelpHidden]>,
+  HelpText<"Use relative instead of canonical paths">;
 def no_cpp_precomp : Flag<"-no-cpp-precomp">;
 def no_integrated_cpp : Flag<"-no-integrated-cpp">, Flags<[DriverOption]>;
 def no__dead__strip__inits__and__terms : Flag<"-no_dead_strip_inits_and_terms">;

diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
index c404e762b8dcc897f55ec89fed9548fcea1d0fbc..7f7affbdb4a3a6188fafa6b662f990cbbe50f59e 100644 (file)
--- a/lib/Driver/Driver.cpp
+++ b/lib/Driver/Driver.cpp
@@ -115,6 +115,9 @@ Compilation *Driver::BuildCompilation(int argc, const char **argv) {
 
   InputArgList *Args = ParseArgStrings(Start, End);
 
+  // -no-canonical-prefixes is used very early in main.
+  Args->ClaimAllArgs(options::OPT_no_canonical_prefixes);
+
   // Extract -ccc args.
   //
   // FIXME: We need to figure out where this behavior should live. Most of it

diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index a6cdac39f5edf87611b2f6b8962dda4a4c9ce91b..b10ad1e12274534934a38be71888a02696d40fce 100644 (file)
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -1104,9 +1104,6 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   // care to warn the user about.
   Args.ClaimAllArgs(options::OPT_clang_ignored_f_Group);
   Args.ClaimAllArgs(options::OPT_clang_ignored_m_Group);
-
-  // -no-canonical-prefixes is used very early in main.
-  Args.ClaimAllArgs(options::OPT_no_canonical_prefixes);
 }
 
 void gcc::Common::ConstructJob(Compilation &C, const JobAction &JA,