Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[fix] Makefile, ocamlbuild: added MYOCAMLBUILD_OPT for always buildin…

…g a rule
  • Loading branch information...
commit 65bfa58570188a0d69baf2619c06280bff59eadc 1 parent f0796f4
@Aqua-Ye Aqua-Ye authored
Showing with 8 additions and 8 deletions.
  1. +7 −5 Makefile
  2. +0 −2  compiler/libopa.mllib
  3. +1 −1  tools/build/Makefile.bld
View
12 Makefile
@@ -27,6 +27,8 @@ export
include $(BUILD_PATH)/Makefile.bld
+MYOCAMLBUILD_OPT = opabsl.qmljs.stamp
+
##
## STANDARD TARGETS
##
@@ -34,7 +36,7 @@ include $(BUILD_PATH)/Makefile.bld
# ALL_TOOLS is built by Makefile.bld from build_tools files
.PHONY: node
node: $(MYOCAMLBUILD)
- $(OCAMLBUILD) opabsl.qmljs.stamp plugins.qmljs.stamp $(call target-tools,$(ALL_TOOLS)) opa-node-packages.stamp qmljs.opa.create
+ $(OCAMLBUILD) plugins.qmljs.stamp $(call target-tools,$(ALL_TOOLS)) opa-node-packages.stamp qmljs.opa.create
@$(call copy-tools,$(ALL_TOOLS))
.PHONY: node-runtime-libs
@@ -43,7 +45,7 @@ node-runtime-libs: $(MYOCAMLBUILD)
.PHONY: $(BUILD_DIR)/bin/opa
$(BUILD_DIR)/bin/opa: $(MYOCAMLBUILD)
- $(OCAMLBUILD) opabsl.qmljs.stamp plugins.qmljs.stamp opa-node-packages.stamp $(target-tool-opa-bin)
+ $(OCAMLBUILD) plugins.qmljs.stamp opa-node-packages.stamp $(target-tool-opa-bin)
@$(copy-tool-opa-bin)
@$(OPALANG_DIR)/tools/utils/install.sh --quiet --dir $(realpath $(BUILD_DIR)) --ocaml-prefix $(OCAMLLIB)/../../..
@@ -52,7 +54,7 @@ opa: $(BUILD_DIR)/bin/opa
.PHONY: opa-node-packages
opa-node-packages: $(MYOCAMLBUILD)
- $(OCAMLBUILD) opabsl.qmljs.stamp plugins.qmljs.stamp opa-node-packages.stamp
+ $(OCAMLBUILD) plugins.qmljs.stamp opa-node-packages.stamp
.PHONY: stdlib
stdlib: opa-node-packages
@@ -65,7 +67,7 @@ DISTRIB_TOOLS = opa-bin opa-plugin-builder-bin opa-plugin-browser-bin bslServerL
.PHONY: distrib
distrib: $(MYOCAMLBUILD)
- $(OCAMLBUILD) opabsl.qmljs.stamp plugins.qmljs.stamp $(call target-tools,$(DISTRIB_TOOLS)) opa-node-packages.stamp qmljs.opa.create
+ $(OCAMLBUILD) plugins.qmljs.stamp $(call target-tools,$(DISTRIB_TOOLS)) opa-node-packages.stamp qmljs.opa.create
@$(call copy-tools,$(DISTRIB_TOOLS))
##
@@ -259,4 +261,4 @@ doc.odocl:
.PHONY: packages-api
packages-api: $(MYOCAMLBUILD)
- OPAOPT="$(OPAOPT) --api --parser classic" $(OCAMLBUILD) opabsl.qmljs.stamp plugins.qmljs.stamp opa-node-packages.stamp
+ OPAOPT="$(OPAOPT) --api --parser classic" $(OCAMLBUILD) plugins.qmljs.stamp opa-node-packages.stamp
View
2  compiler/libopa.mllib
@@ -1,4 +1,2 @@
compiler/opa/Pass_Typing
compiler/opa/Pass_TypeDefinition
-
-
View
2  tools/build/Makefile.bld
@@ -37,7 +37,7 @@
BUILD_DIR ?= _build
MYOCAMLBUILD = $(BUILD_DIR)/myocamlbuild$(EXT_EXE)
-OCAMLBUILD = $(MYOCAMLBUILD) -no-plugin $(OCAMLBUILD_OPT) $(OCAMLBUILD_FLAGS)
+OCAMLBUILD = $(MYOCAMLBUILD) -no-plugin $(OCAMLBUILD_OPT) $(OCAMLBUILD_FLAGS) $(MYOCAMLBUILD_OPT)
BLDDIR ?= $(OPALANG_DIR)/tools/build
Please sign in to comment.
Something went wrong with that request. Please try again.