diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 11:19:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 11:19:25 +0200 |
| commit | 4ea5aea869032dcf046eb26682f0f6485e504c18 (patch) | |
| tree | 13b8ca61e4fa958a5593c4f99a025b5cd8911ed7 | |
| parent | 200ef1e3c389a17b61639bbc2c0e1a9123fedb42 (diff) | |
| parent | a51161ed9892a8f932955ab8dac25e5c7f112a46 (diff) | |
| download | ffmpeg-4ea5aea869032dcf046eb26682f0f6485e504c18.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc: Mention the target_samples and ld variables for fate configs
fate.sh: Allow specifying --as via a specific variable
Conflicts:
doc/fate.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/fate_config.sh.template | 3 | ||||
| -rwxr-xr-x | tests/fate.sh | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/doc/fate_config.sh.template b/doc/fate_config.sh.template index e11e48cc20..1487c1d2ef 100644 --- a/doc/fate_config.sh.template +++ b/doc/fate_config.sh.template @@ -10,11 +10,14 @@ build_only= # set to "yes" for a compile-only instance that skips tests arch= cpu= cross_prefix= +as= cc= +ld= target_os= sysroot= target_exec= target_path= +target_samples= extra_cflags= extra_ldflags= extra_libs= diff --git a/tests/fate.sh b/tests/fate.sh index ecbb16d51b..a401f9d72b 100755 --- a/tests/fate.sh +++ b/tests/fate.sh @@ -49,6 +49,7 @@ configure()( ${arch:+--arch=$arch} \ ${cpu:+--cpu="$cpu"} \ ${cross_prefix:+--cross-prefix="$cross_prefix"} \ + ${as:+--as="$as"} \ ${cc:+--cc="$cc"} \ ${ld:+--ld="$ld"} \ ${target_os:+--target-os="$target_os"} \ |