diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2011-09-30 21:33:09 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2011-09-30 21:33:09 +0000 |
| commit | 26e0b304557519c12b150afe23cd24e28fa20a1d (patch) | |
| tree | db03d57990c8b89b522db4ad976ffe0d83d98167 | |
| parent | 1f634c6dc91805320bb13983faf5e86a2bd07421 (diff) | |
Revert my --working-directory option, which wasn't well thought through.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@140889 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | docs/tools/clang.pod | 7 | ||||
| -rw-r--r-- | include/clang/Driver/Options.td | 2 | ||||
| -rw-r--r-- | lib/Driver/Driver.cpp | 8 | ||||
| -rw-r--r-- | test/Driver/working-directory.c | 3 |
4 files changed, 0 insertions, 20 deletions
diff --git a/docs/tools/clang.pod b/docs/tools/clang.pod index abecd1c8ef..704cc8743b 100644 --- a/docs/tools/clang.pod +++ b/docs/tools/clang.pod @@ -407,13 +407,6 @@ Print timing summary of each stage of compilation. Show commands to run and use verbose output. -=item B<--working-directory> - -Use the given argument as the effective working directory to run the compiler -in. This is useful for running the compiler as if in a specific working -directory without the overhead of having to change directory using an auxiliary -process. - =back diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td index 770b7d86f9..3f48b96d75 100644 --- a/include/clang/Driver/Options.td +++ b/include/clang/Driver/Options.td @@ -855,8 +855,6 @@ def _verbose : Flag<"--verbose">, Alias<v>; def _version : Flag<"--version">; def _warn__EQ : Joined<"--warn-=">, Alias<W_Joined>; def _warn_ : Joined<"--warn-">, Alias<W_Joined>; -def _working_directory : Separate<"--working-directory">, - HelpText<"Use the given argument as the effective working directory">; def _write_dependencies : Flag<"--write-dependencies">, Alias<MD>; def _write_user_dependencies : Flag<"--write-user-dependencies">, Alias<MMD>; def _ : Joined<"--">, Flags<[Unsupported]>; diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index 711b7dbe18..6f49bec01b 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -38,7 +38,6 @@ #include "llvm/Support/FileSystem.h" #include "llvm/Support/Path.h" #include "llvm/Support/Program.h" -#include "llvm/Support/Process.h" #include "InputInfo.h" @@ -324,13 +323,6 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) { if (Args->hasArg(options::OPT_nostdlib)) UseStdLib = false; - // Honor --working-directory. Eventually we want to handle this completely - // internally to support good use as a library, but for now we just change our - // working directory. - if (const Arg *A = Args->getLastArg(options::OPT__working_directory)) { - llvm::sys::Process::SetWorkingDirectory(A->getValue(*Args)); - } - Host = GetHostInfo(DefaultHostTriple.c_str()); // Perform the default argument translations. diff --git a/test/Driver/working-directory.c b/test/Driver/working-directory.c deleted file mode 100644 index 26ae55f6fc..0000000000 --- a/test/Driver/working-directory.c +++ /dev/null @@ -1,3 +0,0 @@ -// RUN: touch %t.h -// RUN: echo '#include "%t.h"' > %t.c -// RUN: %clang --working-directory %t -fsyntax-only %t.c |