Permalink
Browse files

fixed issue (looks like merge leftovers) in description

  • Loading branch information...
1 parent 519c2a2 commit ce21294f0057f987dfcc8193369fd6416a545097 @vsbuffalo vsbuffalo committed Apr 1, 2012
Showing with 1 addition and 5 deletions.
  1. +0 −4 DESCRIPTION
  2. +1 −1 src/Makevars
View
@@ -1,9 +1,5 @@
Package: Rllvm
-<<<<<<< HEAD
-Version: 0.3-0
-=======
Version: 0.4-0
->>>>>>> 00bab558bdf70e3723cb095c186dd1194e65aef0
Title: Interface to llvm for creating native functions
Author: Duncan Temple Lang
SystemRequirements: llvm (>= 2.7)
View
@@ -1,4 +1,4 @@
-LLVM_CONFIG=/usr/local/bin/llvm-config
+LLVM_CONFIG=/usr/local/bin//llvm-config
PKG_CPPFLAGS= $(shell $(LLVM_CONFIG) --cxxflags | sed -e 's/-O[0-9]//g') -fexceptions
PKG_LIBS=$(shell $(LLVM_CONFIG) --ldflags --libs)

0 comments on commit ce21294

Please sign in to comment.