From owner-svn-src-all@freebsd.org Fri Nov 13 19:17:33 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3BA2F2EB5BE for ; Fri, 13 Nov 2020 19:17:33 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CXpBj188Bz4nLs for ; Fri, 13 Nov 2020 19:17:33 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: by mail-wm1-f46.google.com with SMTP id a65so10283523wme.1 for ; Fri, 13 Nov 2020 11:17:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=JeOCoD9b2v9dQ0oaM79ClsfCysF0Vni1Xvvwpd3tcfE=; b=h5oVS+wG2wkaqszDB3aZMxYoPCsCOnw585Wx29H/rRa0VQFggNImguQjr1VcEdgOv7 ouZnULHENaez2YaY5CPHw2uQakVHesjGxaXRQrFiyjRrcZKgv50MYN+WGh/QiuThY9nZ cZNpB8kh00+P+o6y/BXSoYVoWfUL6032+ZjneHOm+FZwyjctBUz3QczCuMeifiPGok2f 90T2JnPaqJ5a0OocNu3GcOzHrGnsp3Obk7gVdP0AbhVtSf425HPo39fwdn10kor9VeFD FdGx9lAVrzuEhGWw0n0JGH9vnsEG6riQiodGBJ69xyQFCUySvc+MnnaEla3Hq0knqlVm 2HvQ== X-Gm-Message-State: AOAM53149Lz4FdOHmUNkmlIcJQK8Z8gXpxxqqV3jHnJB1B3XoinP6ixG yNhFyNQKlsk7gHyZ6Wwt6z/ZGg== X-Google-Smtp-Source: ABdhPJyKW/GemKGFeUS2CwuWoE/yb0/dVtlaa704r9G71YDNcj40b5k1BdzUavDcLgTHtrCIhAU18A== X-Received: by 2002:a1c:4c0a:: with SMTP id z10mr3966203wmf.96.1605295051046; Fri, 13 Nov 2020 11:17:31 -0800 (PST) Received: from [192.168.149.251] (trinity-students-nat.trin.cam.ac.uk. [131.111.193.104]) by smtp.gmail.com with ESMTPSA id v16sm11828220wml.33.2020.11.13.11.17.30 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Nov 2020 11:17:30 -0800 (PST) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.4\)) Subject: Re: svn commit: r367648 - head/share/mk From: Jessica Clarke In-Reply-To: <202011131908.0ADJ8goO038839@repo.freebsd.org> Date: Fri, 13 Nov 2020 19:17:28 +0000 Cc: src-committers , svn-src-all , svn-src-head@freebsd.org Content-Transfer-Encoding: 7bit Message-Id: <647236BA-1263-4ABA-B03F-3789592EB649@freebsd.org> References: <202011131908.0ADJ8goO038839@repo.freebsd.org> To: Ed Maste X-Mailer: Apple Mail (2.3608.120.23.2.4) X-Rspamd-Queue-Id: 4CXpBj188Bz4nLs X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Nov 2020 19:17:33 -0000 On 13 Nov 2020, at 19:08, Ed Maste wrote: > > Author: emaste > Date: Fri Nov 13 19:08:42 2020 > New Revision: 367648 > URL: https://svnweb.freebsd.org/changeset/base/367648 > > Log: > Fix `make makeman` after r367577 > > WITH_INIT_ALL_ZERO and WITH_INIT_ALL_PATTERN are mutually exclusive. > The .error when they were both set broke makeman so demote it to a > warning (and presumably the compiler will fail on an error later on). > > We could improve this to make one take precedence but this is sufficient > for now. You won't get an error. Currently bsd.{prog,lib}.mk and kern.mk check MK_INIT_ALL_ZERO then MK_INIT_ALL_PATTERN so the former takes precedence, but I suspect that if you were to pass the compiler flags for both the last flag would just override anything else, as is the case for most compiler flags. Jess