Drop support for ICE_BIN_DIST #3442
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
externl
approved these changes
Jan 29, 2025
Comment on lines
103
to
+105
| bindir = $(call mappingdir,$(or $1,$(currentdir)),bin) | ||
| else | ||
| bindir = $(ice_bindir) | ||
| endif | ||
|
|
||
| # Use the bin distribution if ICE_BIN_DIST=all or if ICE_BIN_DIST=cpp and processing a file from the cpp directory. | ||
| use-bin-dist = $(or $(filter all,$(ICE_BIN_DIST)),\ | ||
| $(and $(filter cpp,$(ICE_BIN_DIST)),$(filter %/cpp/,$(call mappingdir,$(or $1,$(currentdir)))))) | ||
|
|
||
| bindir = $(if $(use-bin-dist),$(ice_bindir),$(call mappingdir,$(or $1,$(currentdir)),bin)) | ||
| libdir = $(if $(use-bin-dist),$(ice_libdir),$(call mappingdir,$(or $1,$(currentdir)),lib)) | ||
| includedir = $(if $(use-bin-dist),$(ice_includedir),$(call mappingdir,$(or $1,$(currentdir)),include)) | ||
| slicedir = $(if $(use-bin-dist),$(ice_slicedir),$(top_srcdir)/slice) | ||
| sdkdir = $(if $(use-bin-dist),$(ice_home)/sdk,$(top_srcdir)/sdk) | ||
|
|
||
| bindir = $(call mappingdir,$(or $1,$(currentdir)),bin) |
| @@ -21,7 +21,7 @@ $(foreach t, $(slice_translators), $(eval $(call create-translator-project,$(cal | |||
|
|
|||
| include $(foreach p,$(load_first),src/$p/Makefile.mk) | |||
| include $(filter-out $(foreach p,$(load_first),%/src/$p/Makefile.mk),$(shell find $(lang_srcdir)/src -name Makefile.mk)) | |||
| $(call make-projects,$(projects),make-cpp-src-project,,$(filter all cpp,$(ICE_BIN_DIST))) | |||
| $(call make-projects,$(projects),make-cpp-src-project,,) | |||
There was a problem hiding this comment.
Should we clean up make-projects to remove this last argument or is it used elsewhere?
There was a problem hiding this comment.
I would check in a follow up PR.
Co-authored-by: Joe George <joe@externl.com>
Co-authored-by: Joe George <joe@externl.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.