aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Yeo <daveryeo@telus.net>2016-04-25 07:39:08 -0700
committerMichael Niedermayer <michael@niedermayer.cc>2016-04-28 02:33:10 +0200
commit3cb3dddeb49003cd7c1503889b60ce652aafd912 (patch)
treefa4cf5c4ade5107d579ca6531bec6724e4bf1260
parent5d7696fe2b402c20a3b01c7acd2012b0daa53a28 (diff)
downloadffmpeg-3cb3dddeb49003cd7c1503889b60ce652aafd912.tar.gz
configure: Allow choice in choosing a symlink command
Signed-off-by: Dave Yeo <daveryeo@telus.net> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rwxr-xr-xconfigure6
1 files changed, 4 insertions, 2 deletions
diff --git a/configure b/configure
index c7512b8771..89754fd28c 100755
--- a/configure
+++ b/configure
@@ -314,6 +314,7 @@ Toolchain options:
--nm=NM use nm tool NM [$nm_default]
--ar=AR use archive tool AR [$ar_default]
--as=AS use assembler AS [$as_default]
+ --ln_s=LN_S use symbolic link tool LN_S [$ln_s_default]
--strip=STRIP use strip tool STRIP [$strip_default]
--windres=WINDRES use windows resource compiler WINDRES [$windres_default]
--yasmexe=EXE use yasm-compatible assembler EXE [$yasmexe_default]
@@ -2137,6 +2138,7 @@ CMDLINE_SET="
host_os
install
ld
+ ln_s
logfile
malloc_prefix
nm
@@ -3078,7 +3080,7 @@ host_cc_default="gcc"
cp_f="cp -f"
doxygen_default="doxygen"
install="install"
-ln_s="ln -s -f"
+ln_s_default="ln -s -f"
nm_default="nm -g"
objformat="elf"
pkg_config_default=pkg-config
@@ -4001,7 +4003,7 @@ test -n "$cc_type" && enable $cc_type ||
: ${dep_cc_default:=$cc}
: ${ld_default:=$cc}
: ${host_ld_default:=$host_cc}
-set_default ar as objcc dep_cc ld host_ld windres
+set_default ar as objcc dep_cc ld ln_s host_ld windres
probe_cc as "$as"
asflags_filter=$_flags_filter