Revert "Revert "Bump llvm-go to C++14""

This reverts commit edc42be. Internal builds are ready for gcc7.4 Change-Id: Id452b3ca0ca5c919c0cbe133de567b3c4301abb0
ROCm · Aug 22, 2019 · dc7d390 · dc7d390
1 parent 524117a
commit dc7d390
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -103,7 +103,7 @@ func llvmFlags() compilerFlags {
 	}
 	return compilerFlags{
 		cpp: llvmConfig("--cppflags"),
-		cxx: "-std=c++11" + " " + stdLibOption,
+		cxx: "-std=c++14" + " " + stdLibOption,
 		ld:  ldflags,
 	}
 }