diff options
| author | Matthias Benkard <mulk@minimulk.mst-plus> | 2008-08-23 18:38:36 +0200 |
|---|---|---|
| committer | Matthias Benkard <mulk@minimulk.mst-plus> | 2008-08-23 18:38:36 +0200 |
| commit | 12c629db9035c4be51d106e1738aa91a2b74dfcc (patch) | |
| tree | fa59c94331b18a6c94e099ebb69cbbc91ed47363 /GNUmakefile | |
| parent | 54961d09a75b3b7c3dc411c47567caf0d963dfbf (diff) | |
| parent | 13dc1ca7ca1d785313517b9f8d78e63414cb43df (diff) | |
Merge branch 'master' of mulk_benkard@ssh.phx.nearlyfreespeech.net:/home/public/code/mulklisp
Conflicts:
GNUmakefile
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/GNUmakefile b/GNUmakefile index 24bfd8f..11e59a6 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -72,12 +72,13 @@ ToiletKit_LDFLAGS = -lgmp -lffi -ldl USE_LLVM := YES ifeq ($(USE_LLVM),YES) -ADDITIONAL_OBJCCFLAGS += $(ADDITIONAL_OBJCFLAGS) +LLVM_CONFIG = llvm-config +ADDITIONAL_OBJCCFLAGS = $(ADDITIONAL_OBJCFLAGS) ToiletKit_OBJC_FILES += MLKLexicalContext-MLKLLVMCompilation.m -ToiletKit_OBJCC_FILES += MLKLLVMCompiler.mm -ToiletKit_OBJCFLAGS += -DUSE_LLVM -DLLVM_MAJOR_VERSION=`llvm-config --version | cut -f 1 -d.` -DLLVM_MINOR_VERSION=`llvm-config --version | cut -f 2 -d. | sed s/svn//` -ToiletKit_OBJCCFLAGS += `llvm-config --cxxflags` $(ToiletKit_OBJCFLAGS) -ToiletKit_LDFLAGS += `llvm-config --ldflags` `llvm-config --libs backend engine linker codegen transformutils scalaropts analysis ipo` +ToiletKit_OBJCC_FILES = MLKLLVMCompiler.mm +ToiletKit_OBJCFLAGS = -DUSE_LLVM -DLLVM_MAJOR_VERSION=`llvm-config --version | cut -f 1 -d.` -DLLVM_MINOR_VERSION=`llvm-config --version | cut -f 2 -d. | sed s/svn//` +ToiletKit_OBJCCFLAGS = -DUSE_LLVM `$(LLVM_CONFIG) --cxxflags` $(ToiletKit_OBJCFLAGS) +ToiletKit_LDFLAGS += `$(LLVM_CONFIG) --ldflags` `$(LLVM_CONFIG) --libs backend engine linker codegen transformutils scalaropts analysis ipo` endif #TOOL_NAME = etoilet |