summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2009-04-19 13:22:08 +0000
committerDiego Biurrun <diego@biurrun.de>2009-04-19 13:22:08 +0000
commit8d003e22caf05981473c5048184a062537be496c (patch)
tree214c42d06a3b2c0ae6a603a7a953a3d53ea93fce
parentb0b57fa13b4b0f1d4c0d0994eda1ae208257ed14 (diff)
Merge automatic addition of -fno-common to CFLAGS for Windows from trunk.
Originally committed as revision 18619 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5
-rwxr-xr-xconfigure2
1 files changed, 2 insertions, 0 deletions
diff --git a/configure b/configure
index 281ce24a17..c77ee8268f 100755
--- a/configure
+++ b/configure
@@ -1572,6 +1572,7 @@ case $target_os in
SHFLAGS='-shared -Wl,--output-def,$$(@:$(SLIBSUF)=.def) -Wl,--enable-runtime-pseudo-reloc -Wl,--enable-auto-image-base'
objformat="win32"
enable dos_paths
+ check_cflags -fno-common
if ! enabled x86_64; then
check_cpp_condition _mingw.h "(__MINGW32_MAJOR_VERSION > 3) || (__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 15)" ||
die "ERROR: MinGW runtime version must be >= 3.15."
@@ -1596,6 +1597,7 @@ case $target_os in
SHFLAGS='-shared -Wl,--enable-auto-image-base'
objformat="win32"
enable dos_paths
+ check_cflags -fno-common
;;
*-dos|freedos|opendos)
disable ffplay ffserver vhook