len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 10:07:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

simulator: fix missing Werror option + eliminate lib duplicate

Browse source 
configure:
Ensure Werror option doesn't get lost when simcc resets GCCOPTS

uisimulator.make:
Remove ignored duplicate SIMLIB on Darwin

codecs.make:
Eliminate some redundancy

Change-Id: Ieee6f677fd22666cb58aa6fe53eabdc0b0f8c190
This commit is contained in:
Christian Soffke 2024-12-18 13:08:34 +01:00
parent 0bb79dd847
commit a86b1999d0
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/rbcodec/codecs/codecs.make
View file

@ -26,16 +26,15 @@ CODECFLAGS := $(CFLAGS) $(RBCODEC_CFLAGS) -fstrict-aliasing \
-I$(RBCODECLIB_DIR)/codecs -I$(RBCODECLIB_DIR)/codecs/lib -DCODEC -I$(RBCODECLIB_DIR)/codecs -I$(RBCODECLIB_DIR)/codecs/lib -DCODEC
ifdef APP_TYPE ifdef APP_TYPE
ifeq ($(UNAME), Darwin) CODECLDFLAGS = $(SHARED_LDFLAGS)
CODECLDFLAGS = $(SHARED_LDFLAGS) -Wl,-map,$(CODECDIR)/$*.map ifneq ($(UNAME), Darwin)
else CODECLDFLAGS += -Wl,--gc-sections
CODECLDFLAGS = $(SHARED_LDFLAGS) -Wl,--gc-sections -Wl,-Map,$(CODECDIR)/$*.map
endif endif
CODECFLAGS += $(SHARED_CFLAGS) # <-- from Makefile CODECFLAGS += $(SHARED_CFLAGS) # <-- from Makefile
else else
CODECLDFLAGS = -T$(CODECLINK_LDS) -Wl,--gc-sections -Wl,-Map,$(CODECDIR)/$*.map CODECLDFLAGS = -T$(CODECLINK_LDS) -Wl,--gc-sections
endif endif
CODECLDFLAGS += $(GLOBAL_LDOPTS) CODECLDFLAGS += -Wl,$(LDMAP_OPT),$(CODECDIR)/$*.map $(GLOBAL_LDOPTS)
ifdef USE_LTO ifdef USE_LTO
CODECLDFLAGS += -fno-builtin -ffreestanding CODECLDFLAGS += -fno-builtin -ffreestanding

1
tools/configure vendored
View file

@ -1101,6 +1101,7 @@ S(m)all C lib, Logf to Ser(i)al port, LTO Build(X), (E)rror on warnings"
[Ee]) [Ee])
echo "Treating all warnings as errors" echo "Treating all warnings as errors"
GCCOPTS="$GCCOPTS -Werror" GCCOPTS="$GCCOPTS -Werror"
CCOPTS="$CCOPTS -Werror"
;; ;;
"") # Match enter press when finished with advanced options "") # Match enter press when finished with advanced options
cont=0 cont=0

4
uisimulator/uisimulator.make
View file

@ -32,10 +32,10 @@ $(SIMLIB): $$(SIMOBJ) $(UIBMP)
$(BUILDDIR)/$(BINARY): $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $(SIMLIB) $(BUILDDIR)/$(BINARY): $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $(SIMLIB)
ifeq ($(UNAME), Darwin) ifeq ($(UNAME), Darwin)
$(call PRINTS,LD $(BINARY))$(CC) -o $@ $^ $(SIMLIB) $(LDOPTS) $(GLOBAL_LDOPTS) -Wl,-map,$(BUILDDIR)/rockbox.map $(call PRINTS,LD $(BINARY))$(CC) -o $@ $^ $(LDOPTS) $(GLOBAL_LDOPTS) -Wl,$(LDMAP_OPT),$(BUILDDIR)/rockbox.map
else else
$(call PRINTS,LD $(BINARY))$(CC) -o $@ -Wl,--start-group $^ -Wl,--end-group $(LDOPTS) $(GLOBAL_LDOPTS) \ $(call PRINTS,LD $(BINARY))$(CC) -o $@ -Wl,--start-group $^ -Wl,--end-group $(LDOPTS) $(GLOBAL_LDOPTS) \
-Wl,-Map,$(BUILDDIR)/rockbox.map -Wl,$(LDMAP_OPT),$(BUILDDIR)/rockbox.map
endif endif
$(SILENT)$(call objcopy,$@,$@) $(SILENT)$(call objcopy,$@,$@)