[Orc][Kaleidoscope] Fix the orc/kaleidoscope tutorials on linux.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@229949 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/examples/Kaleidoscope/Orc/fully_lazy/Makefile b/examples/Kaleidoscope/Orc/fully_lazy/Makefile
index e14cce2ba36af3cbddce42621f0a3e858ecb509c..5536314f2a30906c750f6a6d74c0d4c71417df01 100644 (file)
--- a/examples/Kaleidoscope/Orc/fully_lazy/Makefile
+++ b/examples/Kaleidoscope/Orc/fully_lazy/Makefile
@@ -6,10 +6,11 @@ else
        CXX := clang++
 endif
 
-LLVM_CXXFLAGS := $(shell llvm-config --cppflags --ldflags --system-libs --libs core orcjit native)
+LLVM_CXXFLAGS := $(shell llvm-config --cxxflags)
+LLVM_LDFLAGS := $(shell llvm-config  --ldflags --system-libs --libs core orcjit native)
 
 toy: toy.cpp
-       $(CXX) $(LLVM_CXXFLAGS) -Wall -std=c++14 -g -O0 -rdynamic -fno-rtti -o toy toy.cpp
+       $(CXX) $(LLVM_CXXFLAGS) -Wall -std=c++11 -g -O0 -rdynamic -fno-rtti -o toy toy.cpp $(LLVM_LDFLAGS)
 
 .PHONY: clean
 clean:

diff --git a/examples/Kaleidoscope/Orc/initial/Makefile b/examples/Kaleidoscope/Orc/initial/Makefile
index e14cce2ba36af3cbddce42621f0a3e858ecb509c..5536314f2a30906c750f6a6d74c0d4c71417df01 100644 (file)
--- a/examples/Kaleidoscope/Orc/initial/Makefile
+++ b/examples/Kaleidoscope/Orc/initial/Makefile
@@ -6,10 +6,11 @@ else
        CXX := clang++
 endif
 
-LLVM_CXXFLAGS := $(shell llvm-config --cppflags --ldflags --system-libs --libs core orcjit native)
+LLVM_CXXFLAGS := $(shell llvm-config --cxxflags)
+LLVM_LDFLAGS := $(shell llvm-config  --ldflags --system-libs --libs core orcjit native)
 
 toy: toy.cpp
-       $(CXX) $(LLVM_CXXFLAGS) -Wall -std=c++14 -g -O0 -rdynamic -fno-rtti -o toy toy.cpp
+       $(CXX) $(LLVM_CXXFLAGS) -Wall -std=c++11 -g -O0 -rdynamic -fno-rtti -o toy toy.cpp $(LLVM_LDFLAGS)
 
 .PHONY: clean
 clean:

diff --git a/examples/Kaleidoscope/Orc/lazy_codegen/Makefile b/examples/Kaleidoscope/Orc/lazy_codegen/Makefile
index e14cce2ba36af3cbddce42621f0a3e858ecb509c..5536314f2a30906c750f6a6d74c0d4c71417df01 100644 (file)
--- a/examples/Kaleidoscope/Orc/lazy_codegen/Makefile
+++ b/examples/Kaleidoscope/Orc/lazy_codegen/Makefile
@@ -6,10 +6,11 @@ else
        CXX := clang++
 endif
 
-LLVM_CXXFLAGS := $(shell llvm-config --cppflags --ldflags --system-libs --libs core orcjit native)
+LLVM_CXXFLAGS := $(shell llvm-config --cxxflags)
+LLVM_LDFLAGS := $(shell llvm-config  --ldflags --system-libs --libs core orcjit native)
 
 toy: toy.cpp
-       $(CXX) $(LLVM_CXXFLAGS) -Wall -std=c++14 -g -O0 -rdynamic -fno-rtti -o toy toy.cpp
+       $(CXX) $(LLVM_CXXFLAGS) -Wall -std=c++11 -g -O0 -rdynamic -fno-rtti -o toy toy.cpp $(LLVM_LDFLAGS)
 
 .PHONY: clean
 clean:

diff --git a/examples/Kaleidoscope/Orc/lazy_irgen/Makefile b/examples/Kaleidoscope/Orc/lazy_irgen/Makefile
index e14cce2ba36af3cbddce42621f0a3e858ecb509c..5536314f2a30906c750f6a6d74c0d4c71417df01 100644 (file)
--- a/examples/Kaleidoscope/Orc/lazy_irgen/Makefile
+++ b/examples/Kaleidoscope/Orc/lazy_irgen/Makefile
@@ -6,10 +6,11 @@ else
        CXX := clang++
 endif
 
-LLVM_CXXFLAGS := $(shell llvm-config --cppflags --ldflags --system-libs --libs core orcjit native)
+LLVM_CXXFLAGS := $(shell llvm-config --cxxflags)
+LLVM_LDFLAGS := $(shell llvm-config  --ldflags --system-libs --libs core orcjit native)
 
 toy: toy.cpp
-       $(CXX) $(LLVM_CXXFLAGS) -Wall -std=c++14 -g -O0 -rdynamic -fno-rtti -o toy toy.cpp
+       $(CXX) $(LLVM_CXXFLAGS) -Wall -std=c++11 -g -O0 -rdynamic -fno-rtti -o toy toy.cpp $(LLVM_LDFLAGS)
 
 .PHONY: clean
 clean: