aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJoern Rennecke <joern.rennecke@embecosm.com>2010-09-03 16:02:37 +0000
committerRainer Orth <ro@gcc.gnu.org>2010-09-03 16:02:37 +0000
commitde3f621b74e14f646a8e077adbed31f05f27fa2b (patch)
treef99c9b2a18601a2e4c7dfcef0b9d8c5dc12afd93 /gcc
parent89039a6b5ebe22124e894c1886adef0a5b8d85ff (diff)
downloadgcc-de3f621b74e14f646a8e077adbed31f05f27fa2b.zip
gcc-de3f621b74e14f646a8e077adbed31f05f27fa2b.tar.gz
gcc-de3f621b74e14f646a8e077adbed31f05f27fa2b.tar.bz2
re PR testsuite/42843 (--enable-build-with-cxx plugin tests fail)
PR testsuite/42843 * Makefile.in (PLUGINCC): Define in terms of @CC@ / @CXX@ (PLUGINCFLAGS): Define in terms of @CFLAGS@ / @CXXFLAGS@ From-SVN: r163833
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/Makefile.in13
2 files changed, 14 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 27e337a..af1c53e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-03 Joern Rennecke <joern.rennecke@embecosm.com>
+
+ PR testsuite/42843
+ * Makefile.in (PLUGINCC): Define in terms of @CC@ / @CXX@
+ (PLUGINCFLAGS): Define in terms of @CFLAGS@ / @CXXFLAGS@
+
2010-09-03 Marcin Baczynski <marbacz@gmail.com>
* dwarf2out.c (file scope): Remove #if0'd code.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 3a34064..acffb60 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -330,11 +330,14 @@ enable_lto = @enable_lto@
LTO_BINARY_READER = @LTO_BINARY_READER@
LTO_USE_LIBELF = @LTO_USE_LIBELF@
-# Compiler needed for plugin support
-PLUGINCC = $(COMPILER)
-
-# Flags needed for plugin support
-PLUGINCFLAGS = $(COMPILER_FLAGS)
+# Compiler and flags needed for plugin support
+ifneq ($(ENABLE_BUILD_WITH_CXX),yes)
+PLUGINCC = @CC@
+PLUGINCFLAGS = @CFLAGS@
+else
+PLUGINCC = @CXX@
+PLUGINCFLAGS = @CXXFLAGS@
+endif
# Libs and linker options needed for plugin support
PLUGINLIBS = @pluginlibs@