mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2025-02-21 12:51:20 +00:00
Fix compiling the ocaml kaleidoscope tutorials
llvm-svn: 125202
This commit is contained in:
parent
db22898512
commit
4a621556e4
@ -73,8 +73,13 @@ Archive.EXE := $(strip $(OCAMLC) -cc $(CXX) $(OCAMLCFLAGS) $(OCAMLDEBUGFLAG:%=%.
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
# Source files
|
# Source files
|
||||||
|
ifndef OcamlSources1
|
||||||
OcamlSources1 := $(sort $(wildcard $(PROJ_SRC_DIR)/*.ml))
|
OcamlSources1 := $(sort $(wildcard $(PROJ_SRC_DIR)/*.ml))
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifndef OcamlHeaders1
|
||||||
OcamlHeaders1 := $(sort $(wildcard $(PROJ_SRC_DIR)/*.mli))
|
OcamlHeaders1 := $(sort $(wildcard $(PROJ_SRC_DIR)/*.mli))
|
||||||
|
endif
|
||||||
|
|
||||||
OcamlSources2 := $(filter-out $(ExcludeSources),$(OcamlSources1))
|
OcamlSources2 := $(filter-out $(ExcludeSources),$(OcamlSources1))
|
||||||
OcamlHeaders2 := $(filter-out $(ExcludeHeaders),$(OcamlHeaders1))
|
OcamlHeaders2 := $(filter-out $(ExcludeHeaders),$(OcamlHeaders1))
|
||||||
@ -352,11 +357,11 @@ $(OutputEXE): $(ToolEXE) $(OcamlDir)/.dir
|
|||||||
ifndef OCAMLOPT
|
ifndef OCAMLOPT
|
||||||
$(ToolEXE): $(ObjectsCMO) $(OcamlDir)/.dir
|
$(ToolEXE): $(ObjectsCMO) $(OcamlDir)/.dir
|
||||||
$(Echo) "Archiving $(notdir $@) for $(BuildMode) build"
|
$(Echo) "Archiving $(notdir $@) for $(BuildMode) build"
|
||||||
$(Verb) $(Archive.EXE) $@ $<
|
$(Verb) $(Archive.EXE) $@ $(ObjectsCMO)
|
||||||
else
|
else
|
||||||
$(ToolEXE): $(ObjectsCMX) $(OcamlDir)/.dir
|
$(ToolEXE): $(ObjectsCMX) $(OcamlDir)/.dir
|
||||||
$(Echo) "Archiving $(notdir $@) for $(BuildMode) build"
|
$(Echo) "Archiving $(notdir $@) for $(BuildMode) build"
|
||||||
$(Verb) $(Archive.EXE) $@ $<
|
$(Verb) $(Archive.EXE) $@ $(ObjectsCMX)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -20,6 +20,15 @@ UsedOcamLibs := llvm llvm_analysis llvm_executionengine llvm_target \
|
|||||||
|
|
||||||
OCAMLCFLAGS += -pp camlp4of
|
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
|
ExcludeSources = $(PROJ_SRC_DIR)/myocamlbuild.ml
|
||||||
|
|
||||||
include $(LEVEL)/bindings/ocaml/Makefile.ocaml
|
include $(LEVEL)/bindings/ocaml/Makefile.ocaml
|
||||||
|
@ -20,6 +20,15 @@ UsedOcamLibs := llvm llvm_analysis llvm_executionengine llvm_target \
|
|||||||
|
|
||||||
OCAMLCFLAGS += -pp camlp4of
|
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
|
ExcludeSources = $(PROJ_SRC_DIR)/myocamlbuild.ml
|
||||||
|
|
||||||
include $(LEVEL)/bindings/ocaml/Makefile.ocaml
|
include $(LEVEL)/bindings/ocaml/Makefile.ocaml
|
||||||
|
Loading…
x
Reference in New Issue
Block a user