Update CC & CFLAG to orignal values, only if they exists - bugfix