diff options
| author | Matthias Benkard <mulk@minimulk.mst-plus> | 2008-08-16 22:51:22 +0200 |
|---|---|---|
| committer | Matthias Benkard <mulk@minimulk.mst-plus> | 2008-08-16 22:51:22 +0200 |
| commit | 5cd4de577c08637cb5d78d1c3376b1ff80e74065 (patch) | |
| tree | c9e0e279f0c95b5f7fc5c691821344cb2e5d3ce4 /GNUmakefile | |
| parent | d858e84c0778dc1851b3a0e324caaf0bef05f274 (diff) | |
| parent | 3f11cb6b3ddd03d3211dd355cbac23884fa5a6e3 (diff) | |
Merge branch 'master' of http://matthias.benkard.de/code/mulklisp
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/GNUmakefile b/GNUmakefile index 9bd1c2f..7fb8754 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -56,7 +56,6 @@ ToiletKit_OBJC_FILES = functions.m globals.m MLKArray.m \ MLKForeignProcedure.m MLKForm.m MLKInteger.m \ MLKInterpretedClosure.m MLKInterpreter.m \ MLKLexicalContext.m \ - MLKLexicalContext-MLKLLVMCompilation.m \ MLKLexicalEnvironment.m MLKNumber.m MLKPackage.m \ MLKParenReader.m MLKQuoteReader.m MLKRatio.m \ MLKReader.m MLKReadtable.m MLKReaderError.m \ @@ -74,9 +73,11 @@ ToiletKit_LDFLAGS = -lgmp -lffi -ldl USE_LLVM := YES ifeq ($(USE_LLVM),YES) ADDITIONAL_OBJCCFLAGS = $(ADDITIONAL_OBJCFLAGS) +ToiletKit_OBJC_FILES += MLKLexicalContext-MLKLLVMCompilation.m ToiletKit_OBJCC_FILES = MLKLLVMCompiler.mm -ToiletKit_OBJCCFLAGS = `llvm-config --cxxflags` $(ToiletKit_OBJCFLAGS) -ToiletKit_LDFLAGS += `llvm-config --ldflags` `llvm-config --libs backend engine linker codegen transformutils scalaropts analysis` +ToiletKit_OBJCFLAGS = -DUSE_LLVM +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 @@ -93,7 +94,7 @@ etshell_OBJCFLAGS = -w toilet_OBJC_FILES = MLKReadEvalPrintLoop.m toilet_OBJC_LIBS += -ledit -lncurses -lToiletKit -LToiletKit.framework \ - -LToiletKit.framework/Versions/Current + -LToiletKit.framework/Versions/Current `llvm-config --ldflags` `llvm-config --libs scalaropts analysis ipo` toilet_OBJCFLAGS = -Wall Test_OBJC_FILES = MLKLowLevelTests.m |