Skip to content

Commit

Permalink
Further fix
Browse files Browse the repository at this point in the history
  • Loading branch information
kwankyu committed Nov 22, 2024
1 parent 7da5efe commit db666ee
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions build/make/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,15 @@ GCC_DEP = @SAGE_GCC_DEP@
OPTIONAL_INSTALLED_PACKAGES = @SAGE_OPTIONAL_INSTALLED_PACKAGES@
INSTALLED_PACKAGES = $(OPTIONAL_INSTALLED_PACKAGES)
INSTALLED_PACKAGE_INSTS = \
$(foreach pkgname,$(INSTALLED_PACKAGES),$(inst_$(pkgname)))
$(foreach pkgname,$(INSTALLED_PACKAGES),inst_$(pkgname))

# All previously installed standard/optional/experimental packages that are to be uninstalled
OPTIONAL_UNINSTALLED_PACKAGES = @SAGE_OPTIONAL_UNINSTALLED_PACKAGES@
UNINSTALLED_PACKAGES = $(OPTIONAL_UNINSTALLED_PACKAGES)
UNINSTALLED_PACKAGES_UNINSTALLS = $(UNINSTALLED_PACKAGES:%=%-uninstall)
UNINSTALLED_PACKAGE_UNINSTALLS = \
$(foreach pkgname,$(UNINSTALLED_PACKAGES),$(pkgname)-uninstall)

.PHONY: $(INSTALLED_PACKAGE_INSTS) $(UNINSTALLED_PACKAGE_UNINSTALLS)

# All packages which should be downloaded
SDIST_PACKAGES = @SAGE_SDIST_PACKAGES@
Expand Down Expand Up @@ -207,7 +210,7 @@ $(foreach tree,SAGE_LOCAL SAGE_VENV SAGE_DOCS, \
$(eval $(tree)_UNINSTALLED_PACKAGE_UNINSTALLS = \
$(foreach pkgname,$(UNINSTALLED_PACKAGES), \
$(if $(findstring $(tree),$(trees_$(pkgname))), \
$($(pkgname)-uninstall)))))
$(pkgname)-uninstall))))

# ==============================================================================

Expand Down Expand Up @@ -286,8 +289,8 @@ base-toolchain: _clean-broken-gcc base

# All targets except for the base packages and except the documentation
all-sage: \
$(SAGE_LOCAL_INSTALLED_PACKAGE_INSTS) $(SAGE_LOCAL_UNINSTALLED_PACKAGES_UNINSTALLS) \
$(SAGE_VENV_INSTALLED_PACKAGE_INSTS) $(SAGE_VENV_UNINSTALLED_PACKAGES_UNINSTALLS)
$(SAGE_LOCAL_INSTALLED_PACKAGE_INSTS) $(SAGE_LOCAL_UNINSTALLED_PACKAGE_UNINSTALLS) \
$(SAGE_VENV_INSTALLED_PACKAGE_INSTS) $(SAGE_VENV_UNINSTALLED_PACKAGE_UNINSTALLS)

# Same but filtered by installation trees:
all-build-local: toolchain-deps
Expand Down

0 comments on commit db666ee

Please sign in to comment.