From 22754929f46d3e0540337a467e949e6336cfe1fb Mon Sep 17 00:00:00 2001 From: Joel Rosdahl Date: Wed, 3 Apr 2019 21:39:03 +0200 Subject: [PATCH] =?utf8?q?Bail=20out=20on=20too=20hard=20compiler=20option?= =?utf8?q?=20=E2=80=9C-gtoggle=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- doc/NEWS.adoc | 2 ++ src/compopt.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/NEWS.adoc b/doc/NEWS.adoc index 493fe4ab5..ce2971cd4 100644 --- a/doc/NEWS.adoc +++ b/doc/NEWS.adoc @@ -57,6 +57,8 @@ Changes before “ARG”. This fixes a bug where compiler feature detection of said flags would not work correctly with ccache. +* Bail out on too hard compiler option `-gtoggle`. + ccache 3.6 ---------- diff --git a/src/compopt.c b/src/compopt.c index dbf32f0cd..2ead25a06 100644 --- a/src/compopt.c +++ b/src/compopt.c @@ -1,4 +1,4 @@ -// Copyright (C) 2010-2018 Joel Rosdahl +// Copyright (C) 2010-2019 Joel Rosdahl // // This program is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the Free @@ -68,6 +68,7 @@ static const struct compopt compopts[] = { {"-fplugin=libcc1plugin", TOO_HARD}, // interaction with GDB {"-frepo", TOO_HARD}, {"-fworking-directory", AFFECTS_CPP}, + {"-gtoggle", TOO_HARD}, {"-idirafter", AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH}, {"-iframework", AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH}, {"-imacros", AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH}, -- 2.47.2