2 files changed, 6 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 803b1b64b80c..24328ea42cae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = odb
 	pkgdesc = C++ Object-Relational Mapping compiler
 	pkgver = 2.5.0b21
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.codesynthesis.com/products/odb/
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index cca33e59580e..f34b36e2e011 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=odb
 pkgver=2.5.0b21
-pkgrel=1
+pkgrel=2
 pkgdesc="C++ Object-Relational Mapping compiler"
 url="https://www.codesynthesis.com/products/odb/"
 arch=('i686' 'x86_64')
@@ -16,11 +16,11 @@ build() {
 	mkdir -p "${srcdir}/${pkgname}-${pkgver}"
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	GPPVER="$(g++ --version | grep 'g++ (GCC)' | sed 's/g++ (GCC) //')"
+	GPPVER="$(${CXX:-g++} --version | grep 'g++ (GCC)' | sed 's/g++ (GCC) //')"
 
 	bpkg create -d odb-gcc-${GPPVER} cc \
-	config.cxx=g++ \
-	config.cc.coptions="-O3 -DODB_GCC_PLUGIN_DIR" \
+	config.cxx=${CXX:-g++} \
+	config.cc.coptions="-O3 -DODB_GCC_PLUGIN_DIR $CXXFLAGS" \
 	config.bin.rpath=${pkgdir}/usr/lib \
 	config.install.root=${pkgdir}/usr
 
@@ -30,7 +30,7 @@ build() {
 
 package() {
 
-	GPPVER="$(g++ --version | grep 'g++ (GCC)' | sed 's/g++ (GCC) //')"
+	GPPVER="$(${CXX:-g++} --version | grep 'g++ (GCC)' | sed 's/g++ (GCC) //')"
 	cd "${srcdir}/${pkgname}-${pkgver}/odb-gcc-${GPPVER}"
 
 	bpkg install odb