Revert part of 1302257e: don't update CXXFLAGS, only xCXXFLAGS
Revert part of 1302257e: don't update CXXFLAGS, only xCXXFLAGS

MidasPaymentLTD/midascoin,MidasPaymentLTD/midascoin,MidasPaymentLTD/midascoin,MidasPaymentLTD/midascoin,MidasPaymentLTD/midascoin