diff options
| -rw-r--r-- | clang/test/Driver/qa_override.c | 2 | ||||
| -rw-r--r-- | clang/tools/driver/driver.cpp | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/clang/test/Driver/qa_override.c b/clang/test/Driver/qa_override.c index 8327ef49f7e..d2754c840ad 100644 --- a/clang/test/Driver/qa_override.c +++ b/clang/test/Driver/qa_override.c @@ -1,7 +1,5 @@ // RUN: env CCC_OVERRIDE_OPTIONS="#+-Os +-Oz +-O +-O3 +-Oignore +a +b +c xb Xa Omagic ^-### " %clang -target x86_64-apple-darwin %s -O2 b -O3 2>&1 | FileCheck %s // RUN: env CCC_OVERRIDE_OPTIONS="x-Werror +-msse" %clang -target x86_64-apple-darwin -Werror %s -c -### 2>&1 | FileCheck %s -check-prefix=RM-WERROR -// RUN: env QA_OVERRIDE_GCC3_OPTIONS="#+-Os +-Oz +-O +-O3 +-Oignore +a +b +c xb Xa Omagic ^-### " %clang -target x86_64-apple-darwin %s -O2 b -O3 2>&1 | FileCheck %s -// RUN: env QA_OVERRIDE_GCC3_OPTIONS="x-Werror +-msse" %clang -target x86_64-apple-darwin -Werror %s -c -### 2>&1 | FileCheck %s -check-prefix=RM-WERROR // CHECK: "-cc1" // CHECK-NOT: "-Oignore" diff --git a/clang/tools/driver/driver.cpp b/clang/tools/driver/driver.cpp index 8acd9b378c2..bce60f67808 100644 --- a/clang/tools/driver/driver.cpp +++ b/clang/tools/driver/driver.cpp @@ -331,14 +331,10 @@ int main(int argc_, const char **argv_) { } // Handle CCC_OVERRIDE_OPTIONS, used for editing a command line behind the - // scenes. Temporarily accept the old QA_OVERRIDE_GCC3_OPTIONS name - // for this, to ease the transition. FIXME: Remove support for that old name - // after a while. + // scenes. if (const char *OverrideStr = ::getenv("CCC_OVERRIDE_OPTIONS")) { // FIXME: Driver shouldn't take extra initial argument. ApplyQAOverride(argv, OverrideStr, SavedStrings); - } else if (const char *OverrideStr = ::getenv("QA_OVERRIDE_GCC3_OPTIONS")) { - ApplyQAOverride(argv, OverrideStr, SavedStrings); } std::string Path = GetExecutablePath(argv[0], CanonicalPrefixes); |
