From 64f07754fe48b4c794ffbcd753803dae21dcc2c1 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 30 Jul 2012 17:44:56 +0200
Subject: [PATCH] buildsys: fix c++ compilation
Based on code by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
common.mak | 2 +-
configure | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/common.mak b/common.mak
index 68909e63dda..eed8f08c6d2 100644
--- a/common.mak
+++ b/common.mak
@@ -28,7 +28,7 @@ CPPFLAGS := $(IFLAGS) $(CPPFLAGS)
CFLAGS += $(ECFLAGS)
CCFLAGS = $(CPPFLAGS) $(CFLAGS)
ASFLAGS := $(CPPFLAGS) $(ASFLAGS)
-CXXFLAGS := $(CFLAGS) $(CXXFLAGS)
+CXXFLAGS += $(CPPFLAGS) $(CFLAGS)
YASMFLAGS += $(IFLAGS) -I$(SRC_PATH)/libavutil/x86/ -Pconfig.asm
HOSTCCFLAGS = $(IFLAGS) $(HOSTCFLAGS)
LDFLAGS := $(ALLFFLIBS:%=-Llib%) $(LDFLAGS)
diff --git a/configure b/configure
index 1445b82a201..54b2ce24bff 100755
--- a/configure
+++ b/configure
@@ -688,7 +688,7 @@ check_cxx(){
log check_cxx "$@"
cat > $TMPCPP
log_file $TMPCPP
- check_cmd $cxx $CPPFLAGS $CFLAGS $CXXFLAGS "$@" -c -o $TMPO $TMPCPP
+ check_cmd $cxx $CPPFLAGS $CFLAGS $CXXFLAGS "$@" $CXX_C -o $TMPO $TMPCPP
}
check_cpp(){
@@ -1977,6 +1977,7 @@ AS_O='-o $@'
CC_C='-c'
CC_E='-E -o $@'
CC_O='-o $@'
+CXX_C='-c'
CXX_O='-o $@'
LD_O='-o $@'
HOSTCC_C='-c'
@@ -3900,6 +3901,7 @@ AS_C=$AS_C
AS_O=$AS_O
CC_C=$CC_C
CC_O=$CC_O
+CXX_C=$CXX_C
CXX_O=$CXX_O
LD_O=$LD_O
LDFLAGS=$LDFLAGS
--
GitLab