diff options
| author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2014-01-05 16:53:17 +0100 |
|---|---|---|
| committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2014-01-05 16:55:23 +0100 |
| commit | f3a1a33b9f72a2aae2680251fcdbfdf27ee0a444 (patch) | |
| tree | e9869df072b6d29dbaa82cb71422d4a18280c3d6 | |
| parent | 660c8d0eff7ea0433a2ddbc1da39c43e263f1196 (diff) | |
| download | rockbox-f3a1a33b9f72a2aae2680251fcdbfdf27ee0a444.zip rockbox-f3a1a33b9f72a2aae2680251fcdbfdf27ee0a444.tar.gz rockbox-f3a1a33b9f72a2aae2680251fcdbfdf27ee0a444.tar.bz2 rockbox-f3a1a33b9f72a2aae2680251fcdbfdf27ee0a444.tar.xz | |
Fix rebuilding of libs on OS X.
OS X ar operates on fat libaries. In this case updating the library isn't
possible and when those change ar will only return an error. Remove the output
file prior to running ar to work around this limitation.
Change-Id: I7ebc66efd092a8e6037ae86a3658afe6b4da777f
| -rw-r--r-- | rbutil/libtools.make | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/rbutil/libtools.make b/rbutil/libtools.make index defd320..87a0c15 100644 --- a/rbutil/libtools.make +++ b/rbutil/libtools.make @@ -23,8 +23,10 @@ endif TOP := $(dir $(lastword $(MAKEFILE_LIST))) ifeq ($(OS),Windows_NT) mkdir = if not exist $(subst /,\,$(1)) mkdir $(subst /,\,$(1)) +rm = del /q /s $(1) else mkdir = mkdir -p $(1) +rm = rm -rf $(1) endif # overwrite for releases @@ -135,11 +137,12 @@ $(TARGET_DIR)$(OUTPUT).dll: $(LIBOBJS) $(addprefix $(OBJDIR),$(EXTRALIBOBJS)) $(TARGET_DIR)lib$(OUTPUT)$(RBARCH).a: $(LIBOBJS) $(addprefix $(OBJDIR),$(EXTRALIBOBJS)) @echo AR $(notdir $@) $(SILENT)$(call mkdir,$(dir $@)) + $(SILENT)$(call rm,$@) $(SILENT)$(AR) rcs $@ $^ clean: - rm -f $(OBJS) $(OUTPUT) $(TARGET_DIR)lib$(OUTPUT)*.a $(OUTPUT).dmg - rm -rf $(OUTPUT)-* i386 ppc $(OBJDIR) + $(call rm, $(OBJS) $(OUTPUT) $(TARGET_DIR)lib$(OUTPUT)*.a $(OUTPUT).dmg) + $(call rm, $(OUTPUT)-* i386 ppc $(OBJDIR)) %.d: $(SILENT)$(call mkdir,$(BUILD_DIR)) |