Fix compiling the ocaml kaleidoscope tutorials

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@125202 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Erick Tryzelaar 2011-02-09 18:32:02 +00:00
parent ffeb98ad3b
commit 01b4ccb6f7
3 changed files with 25 additions and 2 deletions

View File

@ -73,8 +73,13 @@ Archive.EXE := $(strip $(OCAMLC) -cc $(CXX) $(OCAMLCFLAGS) $(OCAMLDEBUGFLAG:%=%.
endif
# Source files
ifndef OcamlSources1
OcamlSources1 := $(sort $(wildcard $(PROJ_SRC_DIR)/*.ml))
endif
ifndef OcamlHeaders1
OcamlHeaders1 := $(sort $(wildcard $(PROJ_SRC_DIR)/*.mli))
endif
OcamlSources2 := $(filter-out $(ExcludeSources),$(OcamlSources1))
OcamlHeaders2 := $(filter-out $(ExcludeHeaders),$(OcamlHeaders1))
@ -352,11 +357,11 @@ $(OutputEXE): $(ToolEXE) $(OcamlDir)/.dir
ifndef OCAMLOPT
$(ToolEXE): $(ObjectsCMO) $(OcamlDir)/.dir
$(Echo) "Archiving $(notdir $@) for $(BuildMode) build"
$(Verb) $(Archive.EXE) $@ $<
$(Verb) $(Archive.EXE) $@ $(ObjectsCMO)
else
$(ToolEXE): $(ObjectsCMX) $(OcamlDir)/.dir
$(Echo) "Archiving $(notdir $@) for $(BuildMode) build"
$(Verb) $(Archive.EXE) $@ $<
$(Verb) $(Archive.EXE) $@ $(ObjectsCMX)
endif
endif

View File

@ -20,6 +20,15 @@ UsedOcamLibs := llvm llvm_analysis llvm_executionengine llvm_target \
OCAMLCFLAGS += -pp camlp4of
OcamlSources1 = \
$(PROJ_SRC_DIR)/ast.ml \
$(PROJ_SRC_DIR)/parser.ml \
$(PROJ_SRC_DIR)/codegen.ml \
$(PROJ_SRC_DIR)/lexer.ml \
$(PROJ_SRC_DIR)/token.ml \
$(PROJ_SRC_DIR)/toplevel.ml \
$(PROJ_SRC_DIR)/toy.ml
ExcludeSources = $(PROJ_SRC_DIR)/myocamlbuild.ml
include $(LEVEL)/bindings/ocaml/Makefile.ocaml

View File

@ -20,6 +20,15 @@ UsedOcamLibs := llvm llvm_analysis llvm_executionengine llvm_target \
OCAMLCFLAGS += -pp camlp4of
OcamlSources1 = \
$(PROJ_SRC_DIR)/ast.ml \
$(PROJ_SRC_DIR)/parser.ml \
$(PROJ_SRC_DIR)/codegen.ml \
$(PROJ_SRC_DIR)/lexer.ml \
$(PROJ_SRC_DIR)/token.ml \
$(PROJ_SRC_DIR)/toplevel.ml \
$(PROJ_SRC_DIR)/toy.ml
ExcludeSources = $(PROJ_SRC_DIR)/myocamlbuild.ml
include $(LEVEL)/bindings/ocaml/Makefile.ocaml