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

build: Rename SHARED_LDFLAG to SHARED_LDFLAGS

Browse source 
Change-Id: Icb81c72fbcfcdad624112a386ba38a40a830d18f
This commit is contained in:
Solomon Peachy 2021-07-08 18:14:27 -04:00
parent a9f36efa62
commit 2ff3425ab1
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/plugins/lua/Makefile
View file

@ -50,7 +50,7 @@ ifdef APP_TYPE
# This is the SDL simulator version # This is the SDL simulator version
$(OUTPUT): $(OBJS) $(OUTPUT): $(OBJS)
$(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_LDFLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_LDFLAGS) $(OBJS) -L$(BUILDDIR) -lplugin -o $@
ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN)
# 'x' must be kept or you'll have "Win32 error 5" # 'x' must be kept or you'll have "Win32 error 5"
# $ fgrep 5 /usr/include/w32api/winerror.h | head -1 # $ fgrep 5 /usr/include/w32api/winerror.h | head -1

2
apps/plugins/plugins.make
View file

@ -112,7 +112,7 @@ $(BUILDDIR)/apps/plugins/%.o: $(ROOTDIR)/apps/plugins/%.c
$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PLUGINFLAGS) -c $< -o $@ $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PLUGINFLAGS) -c $< -o $@
ifdef APP_TYPE ifdef APP_TYPE
PLUGINLDFLAGS = $(SHARED_LDFLAG) -Wl,-Map,$*.map PLUGINLDFLAGS = $(SHARED_LDFLAGS) -Wl,-Map,$*.map
PLUGINFLAGS += $(SHARED_CFLAGS) # <-- from Makefile PLUGINFLAGS += $(SHARED_CFLAGS) # <-- from Makefile
else else
PLUGINLDFLAGS = -T$(PLUGINLINK_LDS) -Wl,--gc-sections -Wl,-Map,$*.map PLUGINLDFLAGS = -T$(PLUGINLINK_LDS) -Wl,--gc-sections -Wl,-Map,$*.map

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

@ -26,7 +26,7 @@ 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
CODECLDFLAGS = $(SHARED_LDFLAG) -Wl,--gc-sections -Wl,-Map,$(CODECDIR)/$*.map CODECLDFLAGS = $(SHARED_LDFLAGS) -Wl,--gc-sections -Wl,-Map,$(CODECDIR)/$*.map
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 -Wl,-Map,$(CODECDIR)/$*.map

18
tools/configure vendored
View file

@ -293,7 +293,7 @@ simcc () {
fi fi
# default share option, override below if needed # default share option, override below if needed
SHARED_LDFLAG="-shared" SHARED_LDFLAGS="-shared"
SHARED_CFLAGS="-fPIC -fvisibility=hidden" SHARED_CFLAGS="-fPIC -fvisibility=hidden"
if [ "$win32crosscompile" = "yes" ]; then if [ "$win32crosscompile" = "yes" ]; then
@ -379,7 +379,7 @@ simcc () {
sigaltstack=`check_sigaltstack` sigaltstack=`check_sigaltstack`
echo "Darwin host detected" echo "Darwin host detected"
LDOPTS="$LDOPTS -ldl" LDOPTS="$LDOPTS -ldl"
SHARED_LDFLAG="-dynamiclib -Wl\,-single_module" SHARED_LDFLAGS="-dynamiclib -Wl\,-single_module"
;; ;;
SunOS) SunOS)
@ -618,7 +618,7 @@ maemocc () {
GCCOPTIMIZE='' GCCOPTIMIZE=''
LDOPTS="-lm -ldl $LDOPTS" LDOPTS="-lm -ldl $LDOPTS"
GLOBAL_LDOPTS="$GLOBAL_LDOPTS -Wl,-z,defs" GLOBAL_LDOPTS="$GLOBAL_LDOPTS -Wl,-z,defs"
SHARED_LDFLAG="-shared" SHARED_LDFLAGS="-shared"
SHARED_CFLAGS='' SHARED_CFLAGS=''
endian="little" endian="little"
thread_support="HAVE_SIGALTSTACK_THREADS" thread_support="HAVE_SIGALTSTACK_THREADS"
@ -713,7 +713,7 @@ pandoracc () {
GCCOPTIMIZE='' GCCOPTIMIZE=''
LDOPTS="-lm -ldl $LDOPTS" LDOPTS="-lm -ldl $LDOPTS"
GLOBAL_LDOPTS="$GLOBAL_LDOPTS -Wl,-z,defs" GLOBAL_LDOPTS="$GLOBAL_LDOPTS -Wl,-z,defs"
SHARED_LDFLAG="-shared" SHARED_LDFLAGS="-shared"
SHARED_CFLAGS='' SHARED_CFLAGS=''
endian="little" endian="little"
thread_support="HAVE_SIGALTSTACK_THREADS" thread_support="HAVE_SIGALTSTACK_THREADS"
@ -744,7 +744,7 @@ arm1176jzlinuxcc () {
GCCOPTIMIZE='' GCCOPTIMIZE=''
LDOPTS="-lasound -lpthread -lm -ldl -lrt $LDOPTS" LDOPTS="-lasound -lpthread -lm -ldl -lrt $LDOPTS"
GLOBAL_LDOPTS="$GLOBAL_LDOPTS -Wl,-z,defs" # warn about undefined symbols in shared libraries GLOBAL_LDOPTS="$GLOBAL_LDOPTS -Wl,-z,defs" # warn about undefined symbols in shared libraries
SHARED_LDFLAG="-shared" SHARED_LDFLAGS="-shared"
SHARED_CFLAGS='' SHARED_CFLAGS=''
endian="little" endian="little"
app_type="ypr0" app_type="ypr0"
@ -787,7 +787,7 @@ androidcc () {
if [ "$modelname" != "ibassodx50" ] && [ "$modelname" != "ibassodx90" ]; then if [ "$modelname" != "ibassodx50" ] && [ "$modelname" != "ibassodx90" ]; then
LDOPTS="$LDOPTS -Wl,-soname,librockbox.so -shared" LDOPTS="$LDOPTS -Wl,-soname,librockbox.so -shared"
fi fi
SHARED_LDFLAG="-shared" SHARED_LDFLAGS="-shared"
SHARED_CFLAGS='' SHARED_CFLAGS=''
GLOBAL_LDOPTS="-Wl,-z,defs -Wl,-z,noexecstack" GLOBAL_LDOPTS="-Wl,-z,defs -Wl,-z,noexecstack"
thread_support="HAVE_SIGALTSTACK_THREADS" thread_support="HAVE_SIGALTSTACK_THREADS"
@ -873,7 +873,7 @@ androidndkcc()
GCCOPTS=`echo $CCOPTS | sed -e s/-ffreestanding// -e s/-nostdlib// -e s/-Wundef//` GCCOPTS=`echo $CCOPTS | sed -e s/-ffreestanding// -e s/-nostdlib// -e s/-Wundef//`
LDOPTS="$LDOPTS -ldl -llog" LDOPTS="$LDOPTS -ldl -llog"
SHARED_LDFLAG="-shared" SHARED_LDFLAGS="-shared"
SHARED_CFLAGS='' SHARED_CFLAGS=''
GLOBAL_LDOPTS="-Wl,-z,defs -Wl,-z,noexecstack" GLOBAL_LDOPTS="-Wl,-z,defs -Wl,-z,noexecstack"
@ -918,7 +918,7 @@ mipsellinuxcc () {
GCCOPTIMIZE='' GCCOPTIMIZE=''
LDOPTS="-lasound -lpthread -lm -ldl -lrt $LDOPTS" LDOPTS="-lasound -lpthread -lm -ldl -lrt $LDOPTS"
GLOBAL_LDOPTS="$GLOBAL_LDOPTS -Wl,-z,defs" GLOBAL_LDOPTS="$GLOBAL_LDOPTS -Wl,-z,defs"
SHARED_LDFLAG="-shared" SHARED_LDFLAGS="-shared"
SHARED_CFLAGS='-fPIC -fvisibility=hidden' SHARED_CFLAGS='-fPIC -fvisibility=hidden'
endian="little" endian="little"
thread_support="HAVE_SIGALTSTACK_THREADS" thread_support="HAVE_SIGALTSTACK_THREADS"
@ -4699,7 +4699,7 @@ export SIMDIR=\$(ROOTDIR)/uisimulator/sdl
export GCCOPTS=${GCCOPTS} export GCCOPTS=${GCCOPTS}
export TARGET_INC=${TARGET_INC} export TARGET_INC=${TARGET_INC}
export LOADADDRESS=${loadaddress} export LOADADDRESS=${loadaddress}
export SHARED_LDFLAG=${SHARED_LDFLAG} export SHARED_LDFLAGS=${SHARED_LDFLAGS}
export SHARED_CFLAGS=${SHARED_CFLAGS} export SHARED_CFLAGS=${SHARED_CFLAGS}
export LDOPTS=${LDOPTS} export LDOPTS=${LDOPTS}
export GLOBAL_LDOPTS=${GLOBAL_LDOPTS} export GLOBAL_LDOPTS=${GLOBAL_LDOPTS}