diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-02 19:03:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-02 19:03:02 +0200 |
| commit | f939bf58b22896fadfcfadaddb9c222a86e7ecfa (patch) | |
| tree | 613e2244a3c4d710fe556cab5a4a4e074eb28caf | |
| parent | cec345625480482d99e7bc6c275979a336769488 (diff) | |
| parent | 604abd025dac4cc73a2f6b0c000c3695c16fb000 (diff) | |
| download | ffmpeg-f939bf58b22896fadfcfadaddb9c222a86e7ecfa.tar.gz | |
Merge commit '604abd025dac4cc73a2f6b0c000c3695c16fb000'
* commit '604abd025dac4cc73a2f6b0c000c3695c16fb000':
configure: Provide an option to override the environment
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -328,6 +328,7 @@ Toolchain options: --enable-pic build position-independent code --enable-thumb compile for Thumb instruction set --enable-lto use link-time optimization + --env="ENV=override" override the environment variables Advanced options (experts only): --malloc-prefix=PREFIX prefix malloc and related names with PREFIX @@ -1979,6 +1980,7 @@ CMDLINE_SET=" cxx dep_cc doxygen + env extra_version gas host_cc @@ -3077,6 +3079,10 @@ for opt do esac done +for e in "$env"; do + eval "export $e" +done + disabled logging && logfile=/dev/null echo "# $0 $FFMPEG_CONFIGURATION" > $logfile |