From owner-svn-src-head@freebsd.org Tue Apr 7 05:40:32 2020 Return-Path: Delivered-To: svn-src-head@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 01D052AA01B; Tue, 7 Apr 2020 05:40:32 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) 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 48xGTW6Htfz477N; Tue, 7 Apr 2020 05:40:31 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Received: by mail-qt1-f195.google.com with SMTP id x16so1797127qts.11; Mon, 06 Apr 2020 22:40:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=MvSuo/QfFwEwynaE95BHZDA9WCwfVpqXBcd1i9Makr0=; b=XOepkGXkUj4CFSbxyQyoOmnPzWnMF6il63zDtQkGyA341lK6CnRXp2q2AimGBCp1EE H4q/Hy4fByJj63loTaH6Ren+wOUJYigRRVc9P/4GQSDSGMgw4PIgVgeRzc7D07b4JlH9 VT6iOVChl54EqWqovaJjp+TNuqxk7dxARHEUSZ/EFpajffD4pYYOG47McDzT0fNP+Py8 6p1BPQT870jgKuDBzn0hKC35o1YcTJCpqidX55+/JJ22tUnyFPcHef08Ki+2Cu8ow6Qk 2U6/wDXOqLsUDqF8kpFyWoPayz+F86sgs9q31i2FuZCBVlgwNdt1QmzKzVetEMgqswGn JZtg== X-Gm-Message-State: AGi0Pub5mRd9nH36ou4j0TRhbKJpJToMqr9rBcq1Uk3yTk/DGfP55Ejg RQ1ASWbIT9DJQRJRgLt08rIVBsZAgIYQBJWzR9EaWy0Z X-Google-Smtp-Source: APiQypJED2QUiHjc17i43zyxxuTxsMsCNhhQ+GId87nv8ULlQKsCLT82qfVZsjNfHtEsIjbd1hkHeIixx0ww3OZ0E/E= X-Received: by 2002:ac8:24a7:: with SMTP id s36mr704755qts.357.1586238030567; Mon, 06 Apr 2020 22:40:30 -0700 (PDT) MIME-Version: 1.0 References: <202004062338.036Nckt3022130@repo.freebsd.org> In-Reply-To: <202004062338.036Nckt3022130@repo.freebsd.org> From: Antoine Brodin Date: Tue, 7 Apr 2020 07:40:19 +0200 Message-ID: Subject: Re: svn commit: r359681 - in head: . share/mk To: Brooks Davis Cc: src-committers , svn-src-all , svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 48xGTW6Htfz477N X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-5.99 / 15.00]; NEURAL_HAM_MEDIUM(-0.99)[-0.995,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Apr 2020 05:40:32 -0000 On Tue, Apr 7, 2020 at 1:38 AM Brooks Davis wrote: > > Author: brooks > Date: Mon Apr 6 23:38:46 2020 > New Revision: 359681 > URL: https://svnweb.freebsd.org/changeset/base/359681 > > Log: > Fix compilation with upstream clang builtin headers. > > By using -nobuiltininc and adding the clang builtin headers resource dir > to the end of the compiler header search path, we can still find headers > such as immintrin.h but find the FreeBSD version of stddef.h/stdarg.h/.. > first. > > This is a workaround until we are able to settle on and complete a plan > to harmonize guard macros with LLVM. We've mostly worked out this on > FreeBSD systems by removing select headers from the installed set of > devel/llvm*, but that isn't a good solution for cross build. > > Submitted by: arichardson > Obtained from: CheriBSD > Sponsored by: DARPA, AFRL > Differential Revision: https://reviews.freebsd.org/D17002 > > Modified: > head/Makefile.inc1 > head/share/mk/bsd.compiler.mk > head/share/mk/bsd.sys.mk > This breaks ports: make[1]: "/usr/share/mk/bsd.sys.mk" line 219: Malformed conditional (${MK_CLANG_BOOTSTRAP} == "no" && ${COMPILER_RESOURCE_DIR} != "unknown" && !defined(BOOTSTRAPPING)) Antoine