From 9f128235b49199f766f40df08c8a7eb25e143ae9 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 31 Dec 2019 15:46:46 +0100 Subject: [PATCH 1/2] Update LLVM submodule --- .gitmodules | 2 +- src/llvm-project | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5f2e8272cd2f3..a9210cfc69ec5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -37,7 +37,7 @@ [submodule "src/llvm-project"] path = src/llvm-project url = https://github.com/rust-lang/llvm-project.git - branch = rustc/9.0-2019-12-19 + branch = rustc/10.0-2020-05-05 [submodule "src/doc/embedded-book"] path = src/doc/embedded-book url = https://github.com/rust-embedded/book.git diff --git a/src/llvm-project b/src/llvm-project index 246dfcd1c864d..943dbddc8e086 160000 --- a/src/llvm-project +++ b/src/llvm-project @@ -1 +1 @@ -Subproject commit 246dfcd1c864d4eab417f74d3599f061d01cb3ae +Subproject commit 943dbddc8e0869a382c4e1b2c135a40e28cf605c From b2bf0cdecb373a770d28044925565e8da07e6cd0 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 19 May 2020 18:05:56 +0200 Subject: [PATCH 2/2] Set CMAKE_CXX_STANDARD when compiling LLD --- src/bootstrap/native.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index 446017f1fabe0..5b6e953484369 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -520,6 +520,10 @@ impl Step for Lld { .define("LLVM_TABLEGEN_EXE", llvm_config.with_file_name("llvm-tblgen")); } + // Explicitly set C++ standard, because upstream doesn't do so + // for standalone builds. + cfg.define("CMAKE_CXX_STANDARD", "14"); + cfg.build(); t!(File::create(&done_stamp));