Fix output build dir name and command line options for custom compilation

Author: barbak

__init__.py

@@ -454,6 +454,8 @@ def initOptions(self):
 		Read options from configuration files and at last from the command line
 		(which has the last word)
 		'''
+
+		self.env.Tool('default')
 		# default values
 		if self.windows:
 			self.compiler    = compiler.visual
@@ -478,11 +480,12 @@ def initOptions(self):
 		else:
 			self.env['CCVERSION'] = self.compiler.version(self.env['CC'])
 			self.env['CXXVERSION'] = self.compiler.version(self.env['CXX'])
-		
+
 		# select the environment from user options
 		compilerName = self.env['compiler']
 		self.compiler   = eval( 'compiler.' + compilerName )
 		self.CC         = self.compiler.CC
+
 		if self.windows:
 			if compilerName == 'visual':
 				self.env.Tool('default')
@@ -492,8 +495,6 @@ def initOptions(self):
 			else:
 				self.env.Tool('default')
 				print 'Error: Unrecognized compiler value on this platform. ('+str(compilerName)+')'
-		else:
-			self.env.Tool('default')
 
 	def createOptions(self, filename, args):
 		'''

compiler/gcc.py

@@ -12,7 +12,7 @@
 linkBin = ccBin
 linkxxBin = cxxBin
 
-def version( bin = 'gcc' ):
+def version( bin = ccBin ):
 	import subprocess
 	try:
 		return subprocess.Popen( [bin, CC['version']], stdout=subprocess.PIPE, stderr=subprocess.PIPE ).communicate()[0].strip()