From nobody Sun Jul 09 17:51:59 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QzZTD2T0vz4mVdd; Sun, 9 Jul 2023 17:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzZTC5vpQz3tZG; Sun, 9 Jul 2023 17:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Ll/XWFEhkjJ7dR9f4J8NE/wmjhd1z2AmwFTVoveJoE=; b=wRa+v4CLSFfUN0+DELN5HwvmbB4eiDvnpAzPpsCeSfz23QZmE2I7jgV65urSQ7tIcgkiMs ZsQAWSvdOBrce1cqnOhuOeKIA4uFFmA6XVtli0TZmEvM03JUUtL+NxgvIi0N3AO9oX1SHh XiCFPcjsAG7OuZ8kCg3Jt7zy2CFdEC8Le9D0YMNm2/yix1aA51a+M0B+fOD3u1MG/FteaS z2QXw91LCqzGx7iakVT2WQrtJndneiHFV88mZeUWEtYsYm0KSmEfqTeiQEIcM+bqHxIdZi MM2DwAkeFzlvUtdH2C2e/fHmY7DG1VSKzBhmcpZtXAFQQS49dLI5Ga1tMFtJnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Ll/XWFEhkjJ7dR9f4J8NE/wmjhd1z2AmwFTVoveJoE=; b=lotD855wMUXXYpQNyzIOfUlYPI5ocpTo8dqPzAyteIX5sJqXvceNPExULCLld38MGj8ux7 hAC3BYackvQK1xRRD522rnTb3Ygos0dFvfmv8U/Hll/IDmidy+9qWOyZAFdBJcySuY6rKo f6ZFqT5aqF+/yvX5I0jQ0VHEHShovkz6KZUMRBTZabBCFeEXUR7LhSn9H3Sw/pDsjkK5QF JEnuRu2ypROVpVgEli9D3P2Cuq1Jd4iEcEsHp3zfIacEv10AIngDOSuGKsPBrHVKZBxGCk 3INRYa5dHoJWkfRFpB4RSjXdMF0CdA1ywyH2d/5kER+QyO19IV7as6ZPEVexxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925119; a=rsa-sha256; cv=none; b=J6PIwJ6PFBk3oY+StviPAzHrQXFAt55n7jdRlezNyRm16AuAfEL4TUYPXqzqOmNgrflWw3 VY7I5puDAff4wZdVHm3zwLwkyQQ5jM/tINtl5oFqkK94YdKhCOJG6+bePBaT6qZD9B9ZeJ I/eQzhEAJyVw5zv3gRmzbmnRtra91hVgseClssfLJiC47goPu2FEHZp/9baCWjRcaLeBcF 6/YOSaAkIN1re++H86zZUAphAC/p+Ld00wLyh/iAL6n7aBzwqUSzZJ+L1XdqU+GjAOUOs7 j8tKIpfiIt+1JnQYoldljR+8/El5CMB3okIZtIEEduuf4lVzxaJURfO0LDMhdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QzZTC50v3z1BNg; Sun, 9 Jul 2023 17:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369Hpx0H096605; Sun, 9 Jul 2023 17:51:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369HpxbT096592; Sun, 9 Jul 2023 17:51:59 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:51:59 GMT Message-Id: <202307091751.369HpxbT096592@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 537f945fc89f - main - Makefile.libcompat: Quote CFLAGS and CXXFLAGS for sub-make List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 537f945fc89fab53f60fee07ac42c8aeab704ce7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=537f945fc89fab53f60fee07ac42c8aeab704ce7 commit 537f945fc89fab53f60fee07ac42c8aeab704ce7 Author: Jessica Clarke AuthorDate: 2023-07-09 17:46:12 +0000 Commit: Jessica Clarke CommitDate: 2023-07-09 17:46:12 +0000 Makefile.libcompat: Quote CFLAGS and CXXFLAGS for sub-make Currently none of the words in these require quoting, but a future commit will add words that do, thus we should make sure to quote each word so the shell doesn't mangle them before calling the sub-make. (Note that :@var@expr@ is the bmake syntax for map, replacing each word with expr's evaluation, with var containing the input word) Reviewed by: emaste, brooks, jhb Differential Revision: https://reviews.freebsd.org/D40921 --- Makefile.libcompat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.libcompat b/Makefile.libcompat index 4bcb7479270c..72ea4d865647 100644 --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -25,9 +25,9 @@ LIB${_LIBCOMPAT}WMAKEENV+= \ # Don't rebuild build-tools targets during normal build. LIB${_LIBCOMPAT}WMAKEENV+= BUILD_TOOLS_META=.NOMETA .endif -LIB${_LIBCOMPAT}WMAKEFLAGS+= CC="${XCC} ${LIB${_LIBCOMPAT}CFLAGS}" \ - CXX="${XCXX} ${LIB${_LIBCOMPAT}CXXFLAGS} ${LIB${_LIBCOMPAT}CFLAGS}" \ - CPP="${XCPP} ${LIB${_LIBCOMPAT}CFLAGS}" \ +LIB${_LIBCOMPAT}WMAKEFLAGS+= CC="${XCC} ${LIB${_LIBCOMPAT}CFLAGS:@v@${v:Q}@}" \ + CXX="${XCXX} ${LIB${_LIBCOMPAT}CXXFLAGS:@v@${v:Q}@} ${LIB${_LIBCOMPAT}CFLAGS:@v@${v:Q}@}" \ + CPP="${XCPP} ${LIB${_LIBCOMPAT}CFLAGS:@v@${v:Q}@}" \ DESTDIR=${WORLDTMP} \ -DNO_CPU_CFLAGS \ MK_BOOT=no \