Skip to content

Commit

Permalink
remove bootstrap bits
Browse files Browse the repository at this point in the history
  • Loading branch information
simonpintarelli committed Feb 25, 2025
1 parent 1ba644a commit 5fff613
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions stackinator/templates/Makefile.compilers
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ all:{% for compiler in compilers %} {{ compiler }}/generated/build_cache{% endfo

{% endif %}
{% endfor %}
# Configure dependencies between compilers
gcc/compilers.yaml: bootstrap/generated/env
$(SPACK) compiler find --scope=user $(call compiler_bin_dirs, $$($(SPACK_HELPER) -e ./bootstrap find --format '{prefix}' {{ compilers.gcc.requires }}))
# # Configure dependencies between compilers
# gcc/compilers.yaml: bootstrap/generated/env
# $(SPACK) compiler find --scope=user $(call compiler_bin_dirs, $$($(SPACK_HELPER) -e ./bootstrap find --format '{prefix}' {{ compilers.gcc.requires }}))

{% if compilers.llvm %}
llvm/compilers.yaml: gcc/generated/env
$(SPACK) compiler find --scope=user $(call compiler_bin_dirs, $$($(SPACK_HELPER) -e ./gcc find --format '{prefix}' {{ compilers.llvm.requires }}))
{% endif %}
# {% if compilers.llvm %}
# llvm/compilers.yaml: gcc/generated/env
# $(SPACK) compiler find --scope=user $(call compiler_bin_dirs, $$($(SPACK_HELPER) -e ./gcc find --format '{prefix}' {{ compilers.llvm.requires }}))
# {% endif %}


include ../Make.inc
Expand All @@ -57,11 +57,11 @@ include ../Make.inc
# specify the order here by conditionally including them, when the dependent exists.
ifeq (,$(filter clean,$(MAKECMDGOALS)))

include bootstrap/Makefile
# include bootstrap/Makefile

ifneq (,$(wildcard bootstrap/Makefile))
include gcc/Makefile
endif
# ifneq (,$(wildcard bootstrap/Makefile))
# include gcc/Makefile
# endif

{% if compilers.llvm %}
ifneq (,$(wildcard gcc/Makefile))
Expand Down

0 comments on commit 5fff613

Please sign in to comment.