summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2012-09-16 21:47:16 +0100
committerMans Rullgard <mans@mansr.com>2012-09-17 22:36:06 +0100
commit2a8a860ae65b0c1c955f148d8697cc30adc71cf3 (patch)
tree99db38b3c9da7749d401f09190c198f15a6b750d /configure
parentee0f53e966e3a637d9e0050d7be2689d4631faef (diff)
configure: include flags in nm variable
This simplifies ensuring proper flags are used when the default is overridden by the system or on the command line. Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure10
1 files changed, 5 insertions, 5 deletions
diff --git a/configure b/configure
index 7c377aa061..8a59262299 100755
--- a/configure
+++ b/configure
@@ -1769,13 +1769,12 @@ ar_default="ar"
cc_default="gcc"
host_cc_default="gcc"
ln_s="ln -sf"
-nm_default="nm"
+nm_default="nm -g"
objformat="elf"
pkg_config_default=pkg-config
ranlib="ranlib"
yasmexe="yasm"
-nm_opts='-g'
nogas=":"
# machine
@@ -2038,7 +2037,7 @@ ranlib="${cross_prefix}${ranlib}"
sysinclude_default="${sysroot}/usr/include"
-set_default cc nm pkg_config sysinclude
+set_default cc pkg_config sysinclude
enabled cross_compile || host_cc_default=$cc
set_default host_cc
@@ -2690,7 +2689,7 @@ case $target_os in
# guards for processor-specific code, instead suppress
# generation of the HWCAPS ELF section on Solaris x86 only.
enabled_all suncc x86 && echo "hwcap_1 = OVERRIDE;" > mapfile && add_ldflags -Wl,-M,mapfile
- nm_opts='-P -g'
+ nm_default='nm -P -g'
;;
netbsd)
disable symver
@@ -2881,6 +2880,7 @@ echo "config:$arch:$subarch:$cpu:$target_os:$(esc $cc_ident):$(esc $LIBAV_CONFIG
check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable pic
set_default $PATHS_LIST
+set_default nm
# we need to build at least one lib type
if ! enabled_any static shared; then
@@ -2928,7 +2928,7 @@ enabled pic && enable_pic
check_cc <<EOF || die "Symbol mangling check failed."
int ff_extern;
EOF
-sym=$($nm $nm_opts $TMPO | awk '/ff_extern/{ print substr($0, match($0, /[^ \t]*ff_extern/)) }')
+sym=$($nm $TMPO | awk '/ff_extern/{ print substr($0, match($0, /[^ \t]*ff_extern/)) }')
extern_prefix=${sym%%ff_extern*}
check_cc <<EOF && enable_weak inline_asm