Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Makefile: only use dune --release on release builds" #3774

Merged
merged 1 commit into from
Feb 18, 2025
Merged

Revert "Makefile: only use dune --release on release builds" #3774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ $(FSTAR1_FULL_EXE): .bare1.src.touch .full1.src.touch .stage1.ml.touch $(MAYBEFO

$(FSTAR2_BARE_EXE): .bare2.src.touch .stage2.ml.touch $(MAYBEFORCE)
$(call bold_msg, "BUILD", "STAGE 2 FSTARC-BARE")
$(MAKE) -C stage2 fstarc-bare
$(MAKE) -C stage2 fstarc-bare FSTAR_DUNE_RELEASE=1
touch -c $@
# ^ Note, even if we don't release fstar-bare itself,
# it is still part of the build of the full fstar, so
Expand All @@ -191,7 +191,7 @@ $(FSTAR2_BARE_EXE): .bare2.src.touch .stage2.ml.touch $(MAYBEFORCE)

$(FSTAR2_FULL_EXE): .bare2.src.touch .full2.src.touch .stage2.ml.touch $(MAYBEFORCE)
$(call bold_msg, "BUILD", "STAGE 2 FSTARC")
$(MAKE) -C stage2 fstarc-full
$(MAKE) -C stage2 fstarc-full FSTAR_DUNE_RELEASE=1
touch -c $@

.alib2.src.touch: $(FSTAR2_FULL_EXE) .force
Expand All @@ -209,7 +209,7 @@ $(FSTAR2_FULL_EXE): .bare2.src.touch .full2.src.touch .stage2.ml.touch $(MAYBEFO

.alib2.touch: .alib2.src.touch .stage2.ml.touch $(MAYBEFORCE)
$(call bold_msg, "BUILD", "STAGE 2 LIB")
$(MAKE) -C stage2/ libapp
$(MAKE) -C stage2/ libapp FSTAR_DUNE_RELEASE=1
touch $@

.plib2.src.touch: $(FSTAR2_FULL_EXE) .alib2.src.touch .force
Expand All @@ -229,7 +229,7 @@ $(FSTAR2_FULL_EXE): .bare2.src.touch .full2.src.touch .stage2.ml.touch $(MAYBEFO

.plib2.touch: .plib2.src.touch .stage2.ml.touch $(MAYBEFORCE)
$(call bold_msg, "BUILD", "STAGE 2 PLUGLIB")
$(MAKE) -C stage2/ libplugin
$(MAKE) -C stage2/ libplugin FSTAR_DUNE_RELEASE=1
touch $@

# F# library, from stage 2.
Expand Down Expand Up @@ -298,7 +298,7 @@ endif
.install-stage2.touch: export FSTAR_LINK_LIBDIRS=$(LINK_OK)
.install-stage2.touch: .stage2.src.touch
$(call bold_msg, "INSTALL", "STAGE 2")
$(MAKE) -C stage2 install PREFIX=$(CURDIR)/stage2/out
$(MAKE) -C stage2 install PREFIX=$(CURDIR)/stage2/out FSTAR_DUNE_RELEASE=1
@# ^ pass PREFIX to make sure we don't get it from env
touch $@

Expand Down Expand Up @@ -326,14 +326,14 @@ install: export PREFIX?=/usr/local
install: export FSTAR_LINK_LIBDIRS=0 # default is false, but set anyway
install:
$(call bold_msg, "INSTALL", "STAGE 2")
$(MAKE) -C stage2 install
$(MAKE) -C stage2 install FSTAR_DUNE_RELEASE=1

__do-install-stage1:
$(call bold_msg, "INSTALL", "STAGE 1")
$(MAKE) -C stage1 install
__do-install-stage2:
$(call bold_msg, "INSTALL", "STAGE 2")
$(MAKE) -C stage2 install
$(MAKE) -C stage2 install FSTAR_DUNE_RELEASE=1

__do-archive: .force
rm -rf $(PKGTMP)
Expand Down
2 changes: 1 addition & 1 deletion mk/stage.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ FSTAR_DUNE_OPTIONS += --display=quiet
endif

FSTAR_DUNE_BUILD_OPTIONS := $(FSTAR_DUNE_OPTIONS)
ifeq ($(FSTAR_RELEASE),1)
ifeq ($(FSTAR_DUNE_RELEASE),1)
FSTAR_DUNE_BUILD_OPTIONS += --release
endif

Expand Down
Loading