diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2010-03-05 22:52:02 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2010-03-05 22:52:02 +0000 |
| commit | eeb971c961d1a1056bffb17ccb7ff491faa5c708 (patch) | |
| tree | e8c578e27f33e8dba8354f3e819e4984a23312f5 /gcc | |
| parent | 1b88f240b95de117532dfcdc95280b6c05dc6500 (diff) | |
| download | gcc-eeb971c961d1a1056bffb17ccb7ff491faa5c708.zip gcc-eeb971c961d1a1056bffb17ccb7ff491faa5c708.tar.gz gcc-eeb971c961d1a1056bffb17ccb7ff491faa5c708.tar.bz2 | |
Makefile.in (PLUGINCC, [...]): New variables.
* Makefile.in (PLUGINCC, PLUGINCFLAGS): New variables.
(site.exp): Export them when plugins are enabled.
testsuite/
* lib/plugin-support.exp (plugin-test-execute): Use PLUGINCC in lieu
of HOSTCC and PLUGINCFLAGS in lieu of HOSTCFLAGS.
From-SVN: r157246
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/Makefile.in | 10 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/lib/plugin-support.exp | 8 |
4 files changed, 23 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4cbe879..9bc8167 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2010-03-05 Eric Botcazou <ebotcazou@adacore.com> + + * Makefile.in (PLUGINCC, PLUGINCFLAGS): New variables. + (site.exp): Export them when plugins are enabled. + 2010-03-05 Sebastian Pop <sebastian.pop@amd.com> PR middle-end/42326 diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 125a80b..bea6cf2 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -325,7 +325,13 @@ LIBELFINC = @LIBELFINC@ # Set to 'yes' if the LTO front end is enabled. enable_lto = @enable_lto@ -# Libs and linker option needed for plugin support +# Compiler needed for plugin support +PLUGINCC = @CC@ + +# Flags needed for plugin support +PLUGINCFLAGS = @CFLAGS@ + +# Libs and linker options needed for plugin support PLUGINLIBS = @pluginlibs@ enable_plugin = @enable_plugin@ @@ -4598,6 +4604,8 @@ site.exp: ./config.status Makefile @echo "set HAVE_LIBSTDCXX_V3 1" >> ./tmp0 @if test "@enable_plugin@" = "yes" ; then \ echo "set ENABLE_PLUGIN 1" >> ./tmp0; \ + echo "set PLUGINCC \"$(PLUGINCC)\"" >> ./tmp0; \ + echo "set PLUGINCFLAGS \"$(PLUGINCFLAGS)\"" >> ./tmp0; \ echo "set GMPINC \"$(GMPINC)\"" >> ./tmp0; \ fi @if test "@enable_lto@" = "yes" ; then \ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index dd95858..8f81bb0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-03-05 Eric Botcazou <ebotcazou@adacore.com> + + * lib/plugin-support.exp (plugin-test-execute): Use PLUGINCC in lieu + of HOSTCC and PLUGINCFLAGS in lieu of HOSTCFLAGS. + 2010-03-05 Jason Merrill <jason@redhat.com> * g++.dg/abi/mangle40.C: Require weak and alias. diff --git a/gcc/testsuite/lib/plugin-support.exp b/gcc/testsuite/lib/plugin-support.exp index 79ccc93..3a7b78a 100644 --- a/gcc/testsuite/lib/plugin-support.exp +++ b/gcc/testsuite/lib/plugin-support.exp @@ -63,8 +63,8 @@ proc plugin-test-execute { plugin_src plugin_tests } { global srcdir objdir global verbose global GMPINC - global HOSTCC - global HOSTCFLAGS + global PLUGINCC + global PLUGINCFLAGS set basename [file tail $plugin_src] set base [file rootname $basename] @@ -88,9 +88,9 @@ proc plugin-test-execute { plugin_src plugin_tests } { set optstr "$includes $extra_flags -DIN_GCC -fPIC -shared" - # Temporarily switch to the environment for the host compiler. + # Temporarily switch to the environment for the plugin compiler. restore_ld_library_path_env_vars - set status [remote_exec build "$HOSTCC $HOSTCFLAGS $plugin_src $optstr -o $plugin_lib"] + set status [remote_exec build "$PLUGINCC $PLUGINCFLAGS $plugin_src $optstr -o $plugin_lib"] set status [lindex $status 0] set_ld_library_path_env_vars |