Commit a3d7c197 authored by Diego Biurrun's avatar Diego Biurrun

Improve compiler information code to print to the console on program startup.

Remove gcc-specific hacks and allow filling relevant information for non-gcc
compilers in configure.

Originally committed as revision 19963 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 5c1f57ff
...@@ -333,12 +333,8 @@ void show_banner(void) ...@@ -333,12 +333,8 @@ void show_banner(void)
{ {
fprintf(stderr, "%s version " FFMPEG_VERSION ", Copyright (c) %d-%d Fabrice Bellard, et al.\n", fprintf(stderr, "%s version " FFMPEG_VERSION ", Copyright (c) %d-%d Fabrice Bellard, et al.\n",
program_name, program_birth_year, this_year); program_name, program_birth_year, this_year);
fprintf(stderr, " built on " __DATE__ " " __TIME__); fprintf(stderr, " built on %s %s with %s %s\n",
#ifdef __GNUC__ __DATE__, __TIME__, CC_TYPE, CC_VERSION);
fprintf(stderr, ", gcc: " __VERSION__ "\n");
#else
fprintf(stderr, ", using a non-gcc compiler\n");
#endif
fprintf(stderr, " configuration: " FFMPEG_CONFIGURATION "\n"); fprintf(stderr, " configuration: " FFMPEG_CONFIGURATION "\n");
print_all_lib_versions(stderr, 1); print_all_lib_versions(stderr, 1);
} }
......
...@@ -1261,6 +1261,7 @@ shlibdir_default="$libdir_default" ...@@ -1261,6 +1261,7 @@ shlibdir_default="$libdir_default"
# toolchain # toolchain
ar="ar" ar="ar"
cc_default="gcc" cc_default="gcc"
cc_version=\"unknown\"
host_cc_default="gcc" host_cc_default="gcc"
ln_s="ln -sf" ln_s="ln -sf"
nm_default="nm" nm_default="nm"
...@@ -1516,6 +1517,7 @@ filter_asflags=echo ...@@ -1516,6 +1517,7 @@ filter_asflags=echo
if $cc -v 2>&1 | grep -qi ^gcc; then if $cc -v 2>&1 | grep -qi ^gcc; then
cc_type=gcc cc_type=gcc
cc_version=__VERSION__
if ! $cc -dumpversion | grep -q '^2\.'; then if ! $cc -dumpversion | grep -q '^2\.'; then
CC_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' CC_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@'
AS_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' AS_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@'
...@@ -2703,6 +2705,8 @@ echo "#define FFMPEG_CONFIG_H" >> $TMPH ...@@ -2703,6 +2705,8 @@ echo "#define FFMPEG_CONFIG_H" >> $TMPH
echo "#define FFMPEG_CONFIGURATION \"$(c_escape $FFMPEG_CONFIGURATION)\"" >> $TMPH echo "#define FFMPEG_CONFIGURATION \"$(c_escape $FFMPEG_CONFIGURATION)\"" >> $TMPH
echo "#define FFMPEG_DATADIR \"$(eval c_escape $datadir)\"" >> $TMPH echo "#define FFMPEG_DATADIR \"$(eval c_escape $datadir)\"" >> $TMPH
echo "#define CC_TYPE \"$cc_type\"" >> $TMPH
echo "#define CC_VERSION $cc_version" >> $TMPH
echo "#define restrict $_restrict" >> $TMPH echo "#define restrict $_restrict" >> $TMPH
if enabled small || disabled optimizations; then if enabled small || disabled optimizations; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment