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.

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

make: delete emptyarchive after test #3302

Merged

Conversation

phiros
Copy link
Member

@phiros phiros commented Jul 2, 2015

Fix for #3280.

@phiros phiros added the Impact: minor The PR is small in size and might only require a quick look of a knowledgeable reviewer label Jul 2, 2015
@@ -131,7 +131,8 @@ CFLAGS += -DCPU_$(CPUDEF)=\"$(CPU)\" -DRIOT_CPU=CPU_$(CPUDEF)
CFLAGS += -DMCU_$(MCUDEF)=\"$(MCU)\" -DRIOT_MCU=MCU_$(MCUDEF)

# OSX fails to create empty archives. Provide a wrapper to catch that error.
ifneq (0, $(shell mkdir -p $(BINDIR); $(AR) rc $(BINDIR)empty-archive.a 2> /dev/null; echo $$?))
ifneq (0, $(shell mkdir -p $(BINDIR); $(AR) rc $(BINDIR)empty-archive.a 2> /dev/null; \
echo $$?; rm -rf $(BINDIR) 2>&1 > /dev/null))
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 implicitly clean all artifacts. Better to do rm $(BINDIR)empty-archive.a

Copy link
Member Author

Choose a reason for hiding this comment

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

done

@phiros phiros added the CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable label Jul 2, 2015
@jnohlgard
Copy link
Member

ACK, please squash, go after Travis

@jnohlgard jnohlgard added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Jul 2, 2015
@Kijewski
Copy link
Contributor

Kijewski commented Jul 2, 2015

ACK

@phiros phiros force-pushed the make_delete_emptyarchive_archive_after_test branch from 0f56921 to 538c992 Compare July 2, 2015 18:16
@phiros phiros removed the CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable label Jul 2, 2015
phiros added a commit that referenced this pull request Jul 2, 2015
…_after_test

make: delete emptyarchive after test
@phiros phiros merged commit aaf0188 into RIOT-OS:master Jul 2, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Impact: minor The PR is small in size and might only require a quick look of a knowledgeable reviewer
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants