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

[Lang Hames]

Author: lhames
Date: Thu Feb 19 20:03:30 2015
New Revision: 229949

URL: http://llvm.org/viewvc/llvm-project?rev=229949&view=rev
Log:
[Orc][Kaleidoscope] Fix the orc/kaleidoscope tutorials on linux.

Modified:
    llvm/trunk/examples/Kaleidoscope/Orc/fully_lazy/Makefile
    llvm/trunk/examples/Kaleidoscope/Orc/initial/Makefile
    llvm/trunk/examples/Kaleidoscope/Orc/lazy_codegen/Makefile
    llvm/trunk/examples/Kaleidoscope/Orc/lazy_irgen/Makefile

Modified: llvm/trunk/examples/Kaleidoscope/Orc/fully_lazy/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/Kaleidoscope/Orc/fully_lazy/Makefile?rev=229949&r1=229948&r2=229949&view=diff
==============================================================================
--- llvm/trunk/examples/Kaleidoscope/Orc/fully_lazy/Makefile (original)
+++ llvm/trunk/examples/Kaleidoscope/Orc/fully_lazy/Makefile Thu Feb 19 20:03:30 2015
@@ -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:

Modified: llvm/trunk/examples/Kaleidoscope/Orc/initial/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/Kaleidoscope/Orc/initial/Makefile?rev=229949&r1=229948&r2=229949&view=diff
==============================================================================
--- llvm/trunk/examples/Kaleidoscope/Orc/initial/Makefile (original)
+++ llvm/trunk/examples/Kaleidoscope/Orc/initial/Makefile Thu Feb 19 20:03:30 2015
@@ -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:

Modified: llvm/trunk/examples/Kaleidoscope/Orc/lazy_codegen/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/Kaleidoscope/Orc/lazy_codegen/Makefile?rev=229949&r1=229948&r2=229949&view=diff
==============================================================================
--- llvm/trunk/examples/Kaleidoscope/Orc/lazy_codegen/Makefile (original)
+++ llvm/trunk/examples/Kaleidoscope/Orc/lazy_codegen/Makefile Thu Feb 19 20:03:30 2015
@@ -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:

Modified: llvm/trunk/examples/Kaleidoscope/Orc/lazy_irgen/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/Kaleidoscope/Orc/lazy_irgen/Makefile?rev=229949&r1=229948&r2=229949&view=diff
==============================================================================
--- llvm/trunk/examples/Kaleidoscope/Orc/lazy_irgen/Makefile (original)
+++ llvm/trunk/examples/Kaleidoscope/Orc/lazy_irgen/Makefile Thu Feb 19 20:03:30 2015
@@ -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: