aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/clang/Driver/Options.td4
-rw-r--r--lib/Driver/Driver.cpp3
-rw-r--r--lib/Driver/Tools.cpp3
3 files changed, 5 insertions, 5 deletions
diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td
index 73dcf2e861..176b10b1a1 100644
--- 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 c404e762b8..7f7affbdb4 100644
--- 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 a6cdac39f5..b10ad1e122 100644
--- 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,