From 7b52c1a832556c38f79cbb1c872a3d3bdba956b3 Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Thu, 15 Aug 2019 10:55:25 +0000 Subject: [PATCH] Bump llvm-go to C++14 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@368989 91177308-0d34-0410-b5e6-96231b3b80d8 --- bindings/go/README.txt | 2 +- bindings/go/llvm/llvm_config.go.in | 2 +- tools/llvm-go/llvm-go.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bindings/go/README.txt b/bindings/go/README.txt index 6ed224d8280..75cca5a82b4 100644 --- a/bindings/go/README.txt +++ b/bindings/go/README.txt @@ -48,7 +48,7 @@ Alternatively, you can build LLVM yourself, but you must then set the CGO_CPPFLAGS, CGO_CXXFLAGS and CGO_LDFLAGS environment variables: $ export CGO_CPPFLAGS="`/path/to/llvm-build/bin/llvm-config --cppflags`" - $ export CGO_CXXFLAGS=-std=c++11 + $ export CGO_CXXFLAGS=-std=c++14 $ export CGO_LDFLAGS="`/path/to/llvm-build/bin/llvm-config --ldflags --libs --system-libs all`" $ go build -tags byollvm diff --git a/bindings/go/llvm/llvm_config.go.in b/bindings/go/llvm/llvm_config.go.in index 41854fa7995..4c63ed10cfb 100644 --- a/bindings/go/llvm/llvm_config.go.in +++ b/bindings/go/llvm/llvm_config.go.in @@ -3,7 +3,7 @@ package llvm /* -#cgo CXXFLAGS: -std=c++11 +#cgo CXXFLAGS: -std=c++14 #cgo CPPFLAGS: @LLVM_CFLAGS@ #cgo LDFLAGS: @LLVM_LDFLAGS@ */ diff --git a/tools/llvm-go/llvm-go.go b/tools/llvm-go/llvm-go.go index 8fbd3c66b3f..a0561dd5fd8 100644 --- a/tools/llvm-go/llvm-go.go +++ b/tools/llvm-go/llvm-go.go @@ -103,7 +103,7 @@ func llvmFlags() compilerFlags { } return compilerFlags{ cpp: llvmConfig("--cppflags"), - cxx: "-std=c++11" + " " + stdLibOption, + cxx: "-std=c++14" + " " + stdLibOption, ld: ldflags, } } -- 2.49.0