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.tar.gz rockbox-f3a1a33b9f72a2aae2680251fcdbfdf27ee0a444.zip |
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 defd320c17..87a0c15464 100644 --- a/rbutil/libtools.make +++ b/rbutil/libtools.make | |||
@@ -23,8 +23,10 @@ endif | |||
23 | TOP := $(dir $(lastword $(MAKEFILE_LIST))) | 23 | TOP := $(dir $(lastword $(MAKEFILE_LIST))) |
24 | ifeq ($(OS),Windows_NT) | 24 | ifeq ($(OS),Windows_NT) |
25 | mkdir = if not exist $(subst /,\,$(1)) mkdir $(subst /,\,$(1)) | 25 | mkdir = if not exist $(subst /,\,$(1)) mkdir $(subst /,\,$(1)) |
26 | rm = del /q /s $(1) | ||
26 | else | 27 | else |
27 | mkdir = mkdir -p $(1) | 28 | mkdir = mkdir -p $(1) |
29 | rm = rm -rf $(1) | ||
28 | endif | 30 | endif |
29 | 31 | ||
30 | # overwrite for releases | 32 | # overwrite for releases |
@@ -135,11 +137,12 @@ $(TARGET_DIR)$(OUTPUT).dll: $(LIBOBJS) $(addprefix $(OBJDIR),$(EXTRALIBOBJS)) | |||
135 | $(TARGET_DIR)lib$(OUTPUT)$(RBARCH).a: $(LIBOBJS) $(addprefix $(OBJDIR),$(EXTRALIBOBJS)) | 137 | $(TARGET_DIR)lib$(OUTPUT)$(RBARCH).a: $(LIBOBJS) $(addprefix $(OBJDIR),$(EXTRALIBOBJS)) |
136 | @echo AR $(notdir $@) | 138 | @echo AR $(notdir $@) |
137 | $(SILENT)$(call mkdir,$(dir $@)) | 139 | $(SILENT)$(call mkdir,$(dir $@)) |
140 | $(SILENT)$(call rm,$@) | ||
138 | $(SILENT)$(AR) rcs $@ $^ | 141 | $(SILENT)$(AR) rcs $@ $^ |
139 | 142 | ||
140 | clean: | 143 | clean: |
141 | rm -f $(OBJS) $(OUTPUT) $(TARGET_DIR)lib$(OUTPUT)*.a $(OUTPUT).dmg | 144 | $(call rm, $(OBJS) $(OUTPUT) $(TARGET_DIR)lib$(OUTPUT)*.a $(OUTPUT).dmg) |
142 | rm -rf $(OUTPUT)-* i386 ppc $(OBJDIR) | 145 | $(call rm, $(OUTPUT)-* i386 ppc $(OBJDIR)) |
143 | 146 | ||
144 | %.d: | 147 | %.d: |
145 | $(SILENT)$(call mkdir,$(BUILD_DIR)) | 148 | $(SILENT)$(call mkdir,$(BUILD_DIR)) |