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

Jump to bottom

Fix Issue #14058 -- 'make install' should not copy non-source files #2918

Closed
wants to merge 1 commit into from
Closed

Fix Issue #14058 -- 'make install' should not copy non-source files #2918

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 3 additions & 4 deletions posix.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,10 +387,9 @@ ifneq (,$(findstring $(OS),linux))
cp -P $(LIBSO) $(INSTALL_DIR)/$(OS)/$(lib_dir)/
ln -sf $(notdir $(LIBSO)) $(INSTALL_DIR)/$(OS)/$(lib_dir)/libphobos2.so
endif
mkdir -p $(INSTALL_DIR)/src/phobos/etc
mkdir -p $(INSTALL_DIR)/src/phobos/std
cp -r std/* $(INSTALL_DIR)/src/phobos/std/
cp -r etc/* $(INSTALL_DIR)/src/phobos/etc/
mkdir -p $(INSTALL_DIR)/src/phobos
find std -type f -name "*.d" | xargs -n1 -i cp -r --parents {} $(INSTALL_DIR)/src/phobos/
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will break when we add some .di files to Phobos.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I know. The original version did have an -o -name "*.di" extra in there, but I removed it when I realized there weren't actually any .di files at present. Anyway, in light of your other comment, this should be rethought anyway ;-)

find etc -type f -name "*.d" | xargs -n1 -i cp -r --parents {} $(INSTALL_DIR)/src/phobos/
cp LICENSE_1_0.txt $(INSTALL_DIR)/phobos-LICENSE.txt

ifeq (1,$(CUSTOM_DRUNTIME))
Expand Down