diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2021-07-08 18:14:27 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2021-07-08 19:53:05 -0400 |
commit | 2ff3425ab1685a1445cc330eca15a78025c1903a (patch) | |
tree | 3b7417aba51d5d26ba19cce0a5637eb685ff2481 | |
parent | a9f36efa62c0f095994e2a711a689b3b3e81aea2 (diff) | |
download | rockbox-2ff3425ab1685a1445cc330eca15a78025c1903a.tar.gz rockbox-2ff3425ab1685a1445cc330eca15a78025c1903a.zip |
build: Rename SHARED_LDFLAG to SHARED_LDFLAGS
Change-Id: Icb81c72fbcfcdad624112a386ba38a40a830d18f
-rw-r--r-- | apps/plugins/lua/Makefile | 2 | ||||
-rw-r--r-- | apps/plugins/plugins.make | 2 | ||||
-rw-r--r-- | lib/rbcodec/codecs/codecs.make | 2 | ||||
-rwxr-xr-x | tools/configure | 18 |
4 files changed, 12 insertions, 12 deletions
diff --git a/apps/plugins/lua/Makefile b/apps/plugins/lua/Makefile index dcf2910c36..a9c8c22099 100644 --- a/apps/plugins/lua/Makefile +++ b/apps/plugins/lua/Makefile | |||
@@ -50,7 +50,7 @@ ifdef APP_TYPE | |||
50 | # This is the SDL simulator version | 50 | # This is the SDL simulator version |
51 | 51 | ||
52 | $(OUTPUT): $(OBJS) | 52 | $(OUTPUT): $(OBJS) |
53 | $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_LDFLAG) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ | 53 | $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_LDFLAGS) $(OBJS) -L$(BUILDDIR) -lplugin -o $@ |
54 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 54 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
55 | # 'x' must be kept or you'll have "Win32 error 5" | 55 | # 'x' must be kept or you'll have "Win32 error 5" |
56 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 56 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make index 71eaeb52c0..ac94a04c59 100644 --- a/apps/plugins/plugins.make +++ b/apps/plugins/plugins.make | |||
@@ -112,7 +112,7 @@ $(BUILDDIR)/apps/plugins/%.o: $(ROOTDIR)/apps/plugins/%.c | |||
112 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PLUGINFLAGS) -c $< -o $@ | 112 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PLUGINFLAGS) -c $< -o $@ |
113 | 113 | ||
114 | ifdef APP_TYPE | 114 | ifdef APP_TYPE |
115 | PLUGINLDFLAGS = $(SHARED_LDFLAG) -Wl,-Map,$*.map | 115 | PLUGINLDFLAGS = $(SHARED_LDFLAGS) -Wl,-Map,$*.map |
116 | PLUGINFLAGS += $(SHARED_CFLAGS) # <-- from Makefile | 116 | PLUGINFLAGS += $(SHARED_CFLAGS) # <-- from Makefile |
117 | else | 117 | else |
118 | PLUGINLDFLAGS = -T$(PLUGINLINK_LDS) -Wl,--gc-sections -Wl,-Map,$*.map | 118 | PLUGINLDFLAGS = -T$(PLUGINLINK_LDS) -Wl,--gc-sections -Wl,-Map,$*.map |
diff --git a/lib/rbcodec/codecs/codecs.make b/lib/rbcodec/codecs/codecs.make index 2c56d6da3f..4f86db0d7d 100644 --- a/lib/rbcodec/codecs/codecs.make +++ b/lib/rbcodec/codecs/codecs.make | |||
@@ -26,7 +26,7 @@ CODECFLAGS := $(CFLAGS) $(RBCODEC_CFLAGS) -fstrict-aliasing \ | |||
26 | -I$(RBCODECLIB_DIR)/codecs -I$(RBCODECLIB_DIR)/codecs/lib -DCODEC | 26 | -I$(RBCODECLIB_DIR)/codecs -I$(RBCODECLIB_DIR)/codecs/lib -DCODEC |
27 | 27 | ||
28 | ifdef APP_TYPE | 28 | ifdef APP_TYPE |
29 | CODECLDFLAGS = $(SHARED_LDFLAG) -Wl,--gc-sections -Wl,-Map,$(CODECDIR)/$*.map | 29 | CODECLDFLAGS = $(SHARED_LDFLAGS) -Wl,--gc-sections -Wl,-Map,$(CODECDIR)/$*.map |
30 | CODECFLAGS += $(SHARED_CFLAGS) # <-- from Makefile | 30 | CODECFLAGS += $(SHARED_CFLAGS) # <-- from Makefile |
31 | else | 31 | else |
32 | CODECLDFLAGS = -T$(CODECLINK_LDS) -Wl,--gc-sections -Wl,-Map,$(CODECDIR)/$*.map | 32 | CODECLDFLAGS = -T$(CODECLINK_LDS) -Wl,--gc-sections -Wl,-Map,$(CODECDIR)/$*.map |
diff --git a/tools/configure b/tools/configure index 9539dc687c..5a08ef649b 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -293,7 +293,7 @@ simcc () { | |||
293 | fi | 293 | fi |
294 | 294 | ||
295 | # default share option, override below if needed | 295 | # default share option, override below if needed |
296 | SHARED_LDFLAG="-shared" | 296 | SHARED_LDFLAGS="-shared" |
297 | SHARED_CFLAGS="-fPIC -fvisibility=hidden" | 297 | SHARED_CFLAGS="-fPIC -fvisibility=hidden" |
298 | 298 | ||
299 | if [ "$win32crosscompile" = "yes" ]; then | 299 | if [ "$win32crosscompile" = "yes" ]; then |
@@ -379,7 +379,7 @@ simcc () { | |||
379 | sigaltstack=`check_sigaltstack` | 379 | sigaltstack=`check_sigaltstack` |
380 | echo "Darwin host detected" | 380 | echo "Darwin host detected" |
381 | LDOPTS="$LDOPTS -ldl" | 381 | LDOPTS="$LDOPTS -ldl" |
382 | SHARED_LDFLAG="-dynamiclib -Wl\,-single_module" | 382 | SHARED_LDFLAGS="-dynamiclib -Wl\,-single_module" |
383 | ;; | 383 | ;; |
384 | 384 | ||
385 | SunOS) | 385 | SunOS) |
@@ -618,7 +618,7 @@ maemocc () { | |||
618 | GCCOPTIMIZE='' | 618 | GCCOPTIMIZE='' |
619 | LDOPTS="-lm -ldl $LDOPTS" | 619 | LDOPTS="-lm -ldl $LDOPTS" |
620 | GLOBAL_LDOPTS="$GLOBAL_LDOPTS -Wl,-z,defs" | 620 | GLOBAL_LDOPTS="$GLOBAL_LDOPTS -Wl,-z,defs" |
621 | SHARED_LDFLAG="-shared" | 621 | SHARED_LDFLAGS="-shared" |
622 | SHARED_CFLAGS='' | 622 | SHARED_CFLAGS='' |
623 | endian="little" | 623 | endian="little" |
624 | thread_support="HAVE_SIGALTSTACK_THREADS" | 624 | thread_support="HAVE_SIGALTSTACK_THREADS" |
@@ -713,7 +713,7 @@ pandoracc () { | |||
713 | GCCOPTIMIZE='' | 713 | GCCOPTIMIZE='' |
714 | LDOPTS="-lm -ldl $LDOPTS" | 714 | LDOPTS="-lm -ldl $LDOPTS" |
715 | GLOBAL_LDOPTS="$GLOBAL_LDOPTS -Wl,-z,defs" | 715 | GLOBAL_LDOPTS="$GLOBAL_LDOPTS -Wl,-z,defs" |
716 | SHARED_LDFLAG="-shared" | 716 | SHARED_LDFLAGS="-shared" |
717 | SHARED_CFLAGS='' | 717 | SHARED_CFLAGS='' |
718 | endian="little" | 718 | endian="little" |
719 | thread_support="HAVE_SIGALTSTACK_THREADS" | 719 | thread_support="HAVE_SIGALTSTACK_THREADS" |
@@ -744,7 +744,7 @@ arm1176jzlinuxcc () { | |||
744 | GCCOPTIMIZE='' | 744 | GCCOPTIMIZE='' |
745 | LDOPTS="-lasound -lpthread -lm -ldl -lrt $LDOPTS" | 745 | LDOPTS="-lasound -lpthread -lm -ldl -lrt $LDOPTS" |
746 | GLOBAL_LDOPTS="$GLOBAL_LDOPTS -Wl,-z,defs" # warn about undefined symbols in shared libraries | 746 | GLOBAL_LDOPTS="$GLOBAL_LDOPTS -Wl,-z,defs" # warn about undefined symbols in shared libraries |
747 | SHARED_LDFLAG="-shared" | 747 | SHARED_LDFLAGS="-shared" |
748 | SHARED_CFLAGS='' | 748 | SHARED_CFLAGS='' |
749 | endian="little" | 749 | endian="little" |
750 | app_type="ypr0" | 750 | app_type="ypr0" |
@@ -787,7 +787,7 @@ androidcc () { | |||
787 | if [ "$modelname" != "ibassodx50" ] && [ "$modelname" != "ibassodx90" ]; then | 787 | if [ "$modelname" != "ibassodx50" ] && [ "$modelname" != "ibassodx90" ]; then |
788 | LDOPTS="$LDOPTS -Wl,-soname,librockbox.so -shared" | 788 | LDOPTS="$LDOPTS -Wl,-soname,librockbox.so -shared" |
789 | fi | 789 | fi |
790 | SHARED_LDFLAG="-shared" | 790 | SHARED_LDFLAGS="-shared" |
791 | SHARED_CFLAGS='' | 791 | SHARED_CFLAGS='' |
792 | GLOBAL_LDOPTS="-Wl,-z,defs -Wl,-z,noexecstack" | 792 | GLOBAL_LDOPTS="-Wl,-z,defs -Wl,-z,noexecstack" |
793 | thread_support="HAVE_SIGALTSTACK_THREADS" | 793 | thread_support="HAVE_SIGALTSTACK_THREADS" |
@@ -873,7 +873,7 @@ androidndkcc() | |||
873 | 873 | ||
874 | GCCOPTS=`echo $CCOPTS | sed -e s/-ffreestanding// -e s/-nostdlib// -e s/-Wundef//` | 874 | GCCOPTS=`echo $CCOPTS | sed -e s/-ffreestanding// -e s/-nostdlib// -e s/-Wundef//` |
875 | LDOPTS="$LDOPTS -ldl -llog" | 875 | LDOPTS="$LDOPTS -ldl -llog" |
876 | SHARED_LDFLAG="-shared" | 876 | SHARED_LDFLAGS="-shared" |
877 | SHARED_CFLAGS='' | 877 | SHARED_CFLAGS='' |
878 | GLOBAL_LDOPTS="-Wl,-z,defs -Wl,-z,noexecstack" | 878 | GLOBAL_LDOPTS="-Wl,-z,defs -Wl,-z,noexecstack" |
879 | 879 | ||
@@ -918,7 +918,7 @@ mipsellinuxcc () { | |||
918 | GCCOPTIMIZE='' | 918 | GCCOPTIMIZE='' |
919 | LDOPTS="-lasound -lpthread -lm -ldl -lrt $LDOPTS" | 919 | LDOPTS="-lasound -lpthread -lm -ldl -lrt $LDOPTS" |
920 | GLOBAL_LDOPTS="$GLOBAL_LDOPTS -Wl,-z,defs" | 920 | GLOBAL_LDOPTS="$GLOBAL_LDOPTS -Wl,-z,defs" |
921 | SHARED_LDFLAG="-shared" | 921 | SHARED_LDFLAGS="-shared" |
922 | SHARED_CFLAGS='-fPIC -fvisibility=hidden' | 922 | SHARED_CFLAGS='-fPIC -fvisibility=hidden' |
923 | endian="little" | 923 | endian="little" |
924 | thread_support="HAVE_SIGALTSTACK_THREADS" | 924 | thread_support="HAVE_SIGALTSTACK_THREADS" |
@@ -4699,7 +4699,7 @@ export SIMDIR=\$(ROOTDIR)/uisimulator/sdl | |||
4699 | export GCCOPTS=${GCCOPTS} | 4699 | export GCCOPTS=${GCCOPTS} |
4700 | export TARGET_INC=${TARGET_INC} | 4700 | export TARGET_INC=${TARGET_INC} |
4701 | export LOADADDRESS=${loadaddress} | 4701 | export LOADADDRESS=${loadaddress} |
4702 | export SHARED_LDFLAG=${SHARED_LDFLAG} | 4702 | export SHARED_LDFLAGS=${SHARED_LDFLAGS} |
4703 | export SHARED_CFLAGS=${SHARED_CFLAGS} | 4703 | export SHARED_CFLAGS=${SHARED_CFLAGS} |
4704 | export LDOPTS=${LDOPTS} | 4704 | export LDOPTS=${LDOPTS} |
4705 | export GLOBAL_LDOPTS=${GLOBAL_LDOPTS} | 4705 | export GLOBAL_LDOPTS=${GLOBAL_LDOPTS} |