From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-3.7 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id A37321F9FC for ; Sat, 6 Nov 2021 21:04:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235155AbhKFVGc (ORCPT ); Sat, 6 Nov 2021 17:06:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33956 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235149AbhKFVGT (ORCPT ); Sat, 6 Nov 2021 17:06:19 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E10FCC061220 for ; Sat, 6 Nov 2021 14:03:29 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id d5so19540787wrc.1 for ; Sat, 06 Nov 2021 14:03:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Apt9TufHmLE2IWIO6wr0yVzlw/fUVTEvSsIOvziBoEY=; b=nGC0K3BrLEhyh0zyS0J6JNqZIlnxReSM6OtcxqV0tAXVPYVCbN7TLGpXhg6SPFDB8k P4kZAa0C6elY6zZC5JBJnrBRyq8Uc4w+/OBEFXqDb76QF5+Zk5j+YUnOp68U92PvVqgv 4wQjKnj3laEMi4h6ZyuxjmoSAYxgAAI6lCCPIGGYv7djdaMOn5puMD/I1HmUBj54GOER 7sFV1vG3rulILstnZ1NRZOWdTGbgNKkne4YtsdQ3ntGrrCfT+eNzjSrpDYZjkTZ/Lc9f 81dH2S4yPr4nGKMitjyi+ln1LQZlhprq3ILX9MUvGR9Mni4HYELY+hCKMev8BtovQtXc /uiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Apt9TufHmLE2IWIO6wr0yVzlw/fUVTEvSsIOvziBoEY=; b=wHNKBTeiaTRA47+SZ6GB/tCHLvwG+VWXDJsoKyiUH/NB/MSeclZaqabiJqUs2rduJO ULA1byOZvyIRsBn062KiFrsl5mJxpS0ma2cUahQs1wqYPYKzmHL9IBHvXgTdydpdtrrT tLJhAg4Q0FGC4SN/yiJ4yUUPQ+E16vVMfqEBQDcSmyK5I/zaikorTePsd4Y6E9M96rBW 0y+fkdJRNKv4lKmYR11gg2Kpe08XSJ259Lh2FgyNw73u6YHRpDV6sYQprp+HgM7KZVHV otBdnktA4BBMZ4K6y/8Kf28mDv9OoATg2cKwGg6x639Zpb4xpuKfGAuIFsQ2iINeST1Q +XeA== X-Gm-Message-State: AOAM532uJmpp3JFalOBValebM+T3gQnYJoVBhcHV6/iZkmj46EWpFwil YG4va/VrSGvjkjGiXP7JALsgDijZEn+o+Q== X-Google-Smtp-Source: ABdhPJy1Fs+0+3wlVhZIYN1lno+HawrLAg/IbjhpFm4pkYlruBGdXZFlT/Vd0I7vPq7vssaQMAsNyQ== X-Received: by 2002:a05:6000:156a:: with SMTP id 10mr60860436wrz.87.1636232608249; Sat, 06 Nov 2021 14:03:28 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id u16sm14108433wmc.21.2021.11.06.14.03.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Nov 2021 14:03:27 -0700 (PDT) From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= To: git@vger.kernel.org Cc: Junio C Hamano , Phillip Wood , Jeff King , Dan Jacques , Eric Wong , Jonathan Nieder , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH 10/16] Makefile: move $(comma), $(empty) and $(space) to shared.mak Date: Sat, 6 Nov 2021 22:03:11 +0100 Message-Id: X-Mailer: git-send-email 2.34.0.rc1.741.gab7bfd97031 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Move these variables over to the shared.max, we'll make use of them in a subsequent commit. There was no reason for these to be "simply expanded variables", so let's use the normal lazy "=" assignment here. See 425ca6710b2 (Makefile: allow combining UBSan with other sanitizers, 2017-07-15) for the commit that introduced these. Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile | 4 ---- shared.mak | 8 ++++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index e65d346e7cd..f3ad497fcb1 100644 --- a/Makefile +++ b/Makefile @@ -1252,10 +1252,6 @@ endif ALL_CFLAGS = $(DEVELOPER_CFLAGS) $(CPPFLAGS) $(CFLAGS) ALL_LDFLAGS = $(LDFLAGS) -comma := , -empty := -space := $(empty) $(empty) - ifdef SANITIZE SANITIZERS := $(foreach flag,$(subst $(comma),$(space),$(SANITIZE)),$(flag)) BASIC_CFLAGS += -fsanitize=$(SANITIZE) -fno-sanitize-recover=$(SANITIZE) diff --git a/shared.mak b/shared.mak index 0170bb397ae..2d597ef7603 100644 --- a/shared.mak +++ b/shared.mak @@ -7,3 +7,11 @@ # # info make --index-search=.DELETE_ON_ERROR .DELETE_ON_ERROR: + +### Global variables + +## comma, empty, space: handy variables as these tokens are either +## special or can be hard to spot among other Makefile syntax. +comma = , +empty = +space = $(empty) $(empty) -- 2.34.0.rc1.741.gab7bfd97031