From a709481d660b84810e923b163ad173bd6f60edc3 Mon Sep 17 00:00:00 2001 From: Bob Wilson Date: Sun, 23 Feb 2014 00:11:56 +0000 Subject: [PATCH] Remove support for the QA_OVERRIDE_GCC3_OPTIONS environment variable. In r199283 I switched the name of this variable to CCC_OVERRIDE_OPTIONS, but I kept some code to continue recognizing the old name temporarily. As far as I know, the only use of this was for some internal testing at Apple, and we've now switched to use the new name. If anyone else is still using this and needs more time to switch names, I guess we'll find out! git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@201962 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/Driver/qa_override.c | 2 -- tools/driver/driver.cpp | 6 +----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/test/Driver/qa_override.c b/test/Driver/qa_override.c index 8327ef49f7..d2754c840a 100644 --- a/test/Driver/qa_override.c +++ b/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/tools/driver/driver.cpp b/tools/driver/driver.cpp index 8acd9b378c..bce60f6780 100644 --- a/tools/driver/driver.cpp +++ b/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); -- 2.40.0