virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

Merge commit '604abd025dac4cc73a2f6b0c000c3695c16fb000'

Browse Source 
* commit '604abd025dac4cc73a2f6b0c000c3695c16fb000':
  configure: Provide an option to override the environment

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-06-02 19:03:02 +02:00
commit f939bf58b2
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -328,6 +328,7 @@ Toolchain options:
--enable-pic build position-independent code --enable-pic build position-independent code
--enable-thumb compile for Thumb instruction set --enable-thumb compile for Thumb instruction set
--enable-lto use link-time optimization --enable-lto use link-time optimization
--env="ENV=override" override the environment variables
Advanced options (experts only): Advanced options (experts only):
--malloc-prefix=PREFIX prefix malloc and related names with PREFIX --malloc-prefix=PREFIX prefix malloc and related names with PREFIX
@ -1979,6 +1980,7 @@ CMDLINE_SET="
cxx cxx
dep_cc dep_cc
doxygen doxygen
env
extra_version extra_version
gas gas
host_cc host_cc
@ -3077,6 +3079,10 @@ for opt do
esac esac
done done
for e in "$env"; do
eval "export $e"
done
disabled logging && logfile=/dev/null disabled logging && logfile=/dev/null
echo "# $0 $FFMPEG_CONFIGURATION" > $logfile echo "# $0 $FFMPEG_CONFIGURATION" > $logfile