From 2c6def856bdc01de200238c0f4204e980de34987 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Wed, 8 Jun 2022 14:05:00 -0700 Subject: Revert "build: check for -fno-pic and -fno-pie while we're checking for pic and pie" This reverts commit 5f02d0d9e164a5bcda072d223eaa5bc92b57747e. Which isn't correct, we have very strange behavior of "force on pie/pic or let the toolchain do whatever it wants, but you can't turn it off." --- mesonbuild/build.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'mesonbuild/build.py') diff --git a/mesonbuild/build.py b/mesonbuild/build.py index bad9f54..140a73c 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -1277,13 +1277,10 @@ class BuildTarget(Target): def _extract_pic_pie(self, kwargs, arg: str, option: str): # Check if we have -fPIC, -fpic, -fPIE, or -fpie in cflags - all_flags = set(self.extra_args['c']) | set(self.extra_args['cpp']) - if {f'-f-{arg.lower()}', f'-f-{arg.upper()}'}.issubset(all_flags): + all_flags = self.extra_args['c'] + self.extra_args['cpp'] + if '-f' + arg.lower() in all_flags or '-f' + arg.upper() in all_flags: mlog.warning(f"Use the '{arg}' kwarg instead of passing '-f{arg}' manually to {self.name!r}") return True - elif {f'-fno-{arg.lower()}', f'-fno-{arg.upper()}'}.issubset(all_flags): - mlog.warning(f"Use the '{arg}' kwarg instead of passing '-fno-{arg}' manually to {self.name!r}") - return False k = OptionKey(option) if arg in kwargs: -- cgit v1.1