diff options
| author | Christian Soffke <christian.soffke@gmail.com> | 2024-12-18 13:08:34 +0100 |
|---|---|---|
| committer | Christian Soffke <christian.soffke@gmail.com> | 2024-12-19 15:04:46 -0500 |
| commit | a86b1999d06738cee659a9b6efcdbfe7fd41d6c1 (patch) | |
| tree | ae2b7f934c5d6137ec4b5717743c5f5dd95b5d01 | |
| parent | 0bb79dd84776ee32ad2adab20c3b5be57aa6a4aa (diff) | |
| download | rockbox-a86b1999d0.tar.gz rockbox-a86b1999d0.zip | |
simulator: fix missing Werror option + eliminate lib duplicate
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
| -rw-r--r-- | lib/rbcodec/codecs/codecs.make | 11 | ||||
| -rwxr-xr-x | tools/configure | 1 | ||||
| -rw-r--r-- | uisimulator/uisimulator.make | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/lib/rbcodec/codecs/codecs.make b/lib/rbcodec/codecs/codecs.make index c9077ae890..f2ba8d644c 100644 --- a/lib/rbcodec/codecs/codecs.make +++ b/lib/rbcodec/codecs/codecs.make @@ -26,16 +26,15 @@ CODECFLAGS := $(CFLAGS) $(RBCODEC_CFLAGS) -fstrict-aliasing \ -I$(RBCODECLIB_DIR)/codecs -I$(RBCODECLIB_DIR)/codecs/lib -DCODEC ifdef APP_TYPE - ifeq ($(UNAME), Darwin) - CODECLDFLAGS = $(SHARED_LDFLAGS) -Wl,-map,$(CODECDIR)/$*.map - else - CODECLDFLAGS = $(SHARED_LDFLAGS) -Wl,--gc-sections -Wl,-Map,$(CODECDIR)/$*.map + CODECLDFLAGS = $(SHARED_LDFLAGS) + ifneq ($(UNAME), Darwin) + CODECLDFLAGS += -Wl,--gc-sections endif CODECFLAGS += $(SHARED_CFLAGS) # <-- from Makefile else - CODECLDFLAGS = -T$(CODECLINK_LDS) -Wl,--gc-sections -Wl,-Map,$(CODECDIR)/$*.map + CODECLDFLAGS = -T$(CODECLINK_LDS) -Wl,--gc-sections endif -CODECLDFLAGS += $(GLOBAL_LDOPTS) +CODECLDFLAGS += -Wl,$(LDMAP_OPT),$(CODECDIR)/$*.map $(GLOBAL_LDOPTS) ifdef USE_LTO CODECLDFLAGS += -fno-builtin -ffreestanding diff --git a/tools/configure b/tools/configure index eec0b8b18a..8624081359 100755 --- a/tools/configure +++ b/tools/configure @@ -1101,6 +1101,7 @@ S(m)all C lib, Logf to Ser(i)al port, LTO Build(X), (E)rror on warnings" [Ee]) echo "Treating all warnings as errors" GCCOPTS="$GCCOPTS -Werror" + CCOPTS="$CCOPTS -Werror" ;; "") # Match enter press when finished with advanced options cont=0 diff --git a/uisimulator/uisimulator.make b/uisimulator/uisimulator.make index 85d7c014ef..f63b9e6ee4 100644 --- a/uisimulator/uisimulator.make +++ b/uisimulator/uisimulator.make @@ -32,10 +32,10 @@ $(SIMLIB): $$(SIMOBJ) $(UIBMP) $(BUILDDIR)/$(BINARY): $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $(SIMLIB) 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 $(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 $(SILENT)$(call objcopy,$@,$@) |