From aa48fc63d01ab8754333d73c86a3416b0bacfb8d Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 27 Nov 2023 15:41:12 +0530 Subject: [PATCH] Better escaping for flags in the generated toml file for building pyqt extensions --- setup/build.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/setup/build.py b/setup/build.py index 7bc9095f3e..1ee21fca1b 100644 --- a/setup/build.py +++ b/setup/build.py @@ -688,12 +688,12 @@ sip-files-dir = "." [tool.sip.builder] qmake-settings = [ - 'QMAKE_CC = {self.env.cc}', - 'QMAKE_CXX = {self.env.cxx}', - 'QMAKE_LINK = {self.env.linker or self.env.cxx}', - 'QMAKE_CFLAGS += {shlex.join(self.env.base_cflags)}', - 'QMAKE_CXXFLAGS += {shlex.join(self.env.base_cxxflags)}', - 'QMAKE_LFLAGS += {shlex.join(self.env.base_ldflags)}', + """QMAKE_CC = {self.env.cc}""", + """QMAKE_CXX = {self.env.cxx}""", + """QMAKE_LINK = {self.env.linker or self.env.cxx}""", + """QMAKE_CFLAGS += {shlex.join(self.env.base_cflags)}""", + """QMAKE_CXXFLAGS += {shlex.join(self.env.base_cxxflags)}""", + """QMAKE_LFLAGS += {shlex.join(self.env.base_ldflags)}""", ] [tool.sip.bindings.{ext.name}] @@ -702,7 +702,7 @@ sources = {ext.sources} exceptions = {needs_exceptions} include-dirs = {ext.inc_dirs} qmake-QT = {ext.qt_modules} -sip-file = "{os.path.basename(sipf)}" +sip-file = {os.path.basename(sipf)!r} ''') shutil.copy2(sipf, src_dir)