* configure.ac: If build != host, create a separate build-config.h
file desecribing the build machine. * configure: Regenerate. * lf.c: Include build-config.h instead of config.h. * dgen.c: Likewise. * igen.c: Likewise. * misc.c: Likewise. * misc.h: Likewise. * filter.c: Likewise. * table.c: Likewise.
This commit is contained in:
parent
4473e00469
commit
68a3e151da
|
@ -1,3 +1,16 @@
|
||||||
|
2009-11-13 Nathan Froyd <froydnj@codesourcery.com>
|
||||||
|
|
||||||
|
* configure.ac: If build != host, create a separate build-config.h
|
||||||
|
file desecribing the build machine.
|
||||||
|
* configure: Regenerate.
|
||||||
|
* lf.c: Include build-config.h instead of config.h.
|
||||||
|
* dgen.c: Likewise.
|
||||||
|
* igen.c: Likewise.
|
||||||
|
* misc.c: Likewise.
|
||||||
|
* misc.h: Likewise.
|
||||||
|
* filter.c: Likewise.
|
||||||
|
* table.c: Likewise.
|
||||||
|
|
||||||
2009-10-15 Joel Sherrill <joel.sherrill@oarcorp.com>
|
2009-10-15 Joel Sherrill <joel.sherrill@oarcorp.com>
|
||||||
|
|
||||||
* std-config.h: Fix spelling error.
|
* std-config.h: Fix spelling error.
|
||||||
|
|
|
@ -5867,6 +5867,32 @@ $as_echo "no" >&6; }
|
||||||
sim_fpu=
|
sim_fpu=
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Since we run commands on the build system, we have to create a
|
||||||
|
# separate config header for the build system if build != host.
|
||||||
|
if test x$host = x$build; then
|
||||||
|
ac_config_commands="$ac_config_commands build-config.h"
|
||||||
|
|
||||||
|
else
|
||||||
|
tempdir=build.$$
|
||||||
|
rm -rf $tempdir
|
||||||
|
mkdir $tempdir
|
||||||
|
cd $tempdir
|
||||||
|
case ${srcdir} in
|
||||||
|
/* | A-Za-z:\\/* ) realsrcdir=${srcdir};;
|
||||||
|
*) realsrcdir=../${srcdir};;
|
||||||
|
esac
|
||||||
|
saved_CFLAGS="${CFLAGS}"
|
||||||
|
CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
|
||||||
|
LDFLAGS="${LDFLAGS_FOR_BUILD}" \
|
||||||
|
${realsrcdir}/configure \
|
||||||
|
--enable-languages=${enable_languages-all} \
|
||||||
|
--target=$target_alias --host=$build_alias --build=$build_alias
|
||||||
|
CFLAGS="${saved_CFLAGS}"
|
||||||
|
mv config.h ../build-config.h
|
||||||
|
cd ..
|
||||||
|
rm -rf $tempdir
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -6701,6 +6727,7 @@ for ac_config_target in $ac_config_targets
|
||||||
do
|
do
|
||||||
case $ac_config_target in
|
case $ac_config_target in
|
||||||
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;;
|
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;;
|
||||||
|
"build-config.h") CONFIG_COMMANDS="$CONFIG_COMMANDS build-config.h" ;;
|
||||||
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
||||||
"default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
|
"default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
|
||||||
|
|
||||||
|
@ -7247,6 +7274,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
|
||||||
|
|
||||||
|
|
||||||
case $ac_file$ac_mode in
|
case $ac_file$ac_mode in
|
||||||
|
"build-config.h":C) cp config.h build-config.h ;;
|
||||||
"default":C) case x$CONFIG_HEADERS in xconfig.h:config.in) echo > stamp-h ;; esac ;;
|
"default":C) case x$CONFIG_HEADERS in xconfig.h:config.in) echo > stamp-h ;; esac ;;
|
||||||
|
|
||||||
esac
|
esac
|
||||||
|
|
|
@ -848,6 +848,31 @@ else
|
||||||
sim_fpu=
|
sim_fpu=
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Since we run commands on the build system, we have to create a
|
||||||
|
# separate config header for the build system if build != host.
|
||||||
|
if test x$host = x$build; then
|
||||||
|
AC_CONFIG_COMMANDS([build-config.h],[cp config.h build-config.h])
|
||||||
|
else
|
||||||
|
tempdir=build.$$
|
||||||
|
rm -rf $tempdir
|
||||||
|
mkdir $tempdir
|
||||||
|
cd $tempdir
|
||||||
|
case ${srcdir} in
|
||||||
|
/* | [A-Za-z]:[\\/]* ) realsrcdir=${srcdir};;
|
||||||
|
*) realsrcdir=../${srcdir};;
|
||||||
|
esac
|
||||||
|
saved_CFLAGS="${CFLAGS}"
|
||||||
|
CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
|
||||||
|
LDFLAGS="${LDFLAGS_FOR_BUILD}" \
|
||||||
|
${realsrcdir}/configure \
|
||||||
|
--enable-languages=${enable_languages-all} \
|
||||||
|
--target=$target_alias --host=$build_alias --build=$build_alias
|
||||||
|
CFLAGS="${saved_CFLAGS}"
|
||||||
|
mv config.h ../build-config.h
|
||||||
|
cd ..
|
||||||
|
rm -rf $tempdir
|
||||||
|
fi
|
||||||
|
|
||||||
dnl Check for exe extension
|
dnl Check for exe extension
|
||||||
AC_EXEEXT
|
AC_EXEEXT
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
|
||||||
#include "config.h"
|
#include "build-config.h"
|
||||||
#include "misc.h"
|
#include "misc.h"
|
||||||
#include "lf.h"
|
#include "lf.h"
|
||||||
#include "table.h"
|
#include "table.h"
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
#include "config.h"
|
#include "build-config.h"
|
||||||
|
|
||||||
#ifdef HAVE_STRING_H
|
#ifdef HAVE_STRING_H
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
#include "misc.h"
|
#include "misc.h"
|
||||||
#include "lf.h"
|
#include "lf.h"
|
||||||
#include "table.h"
|
#include "table.h"
|
||||||
#include "config.h"
|
#include "build-config.h"
|
||||||
|
|
||||||
#include "filter.h"
|
#include "filter.h"
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
|
||||||
#include "config.h"
|
#include "build-config.h"
|
||||||
#include "misc.h"
|
#include "misc.h"
|
||||||
#include "lf.h"
|
#include "lf.h"
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
|
||||||
#include "config.h"
|
#include "build-config.h"
|
||||||
#include "misc.h"
|
#include "misc.h"
|
||||||
|
|
||||||
#ifdef HAVE_STDLIB_H
|
#ifdef HAVE_STDLIB_H
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
|
|
||||||
/* Frustrating header junk */
|
/* Frustrating header junk */
|
||||||
|
|
||||||
#include "config.h"
|
#include "build-config.h"
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
|
||||||
#include "config.h"
|
#include "build-config.h"
|
||||||
#include "misc.h"
|
#include "misc.h"
|
||||||
#include "lf.h"
|
#include "lf.h"
|
||||||
#include "table.h"
|
#include "table.h"
|
||||||
|
|
Loading…
Reference in New Issue