X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=SConstruct;h=517b1a66c88a185c102551e98d2250f1f7c6ea9b;hb=67212bbf2fdeaa702e607337c6277ddd03d7de61;hp=80833871bcf218949b12dac2029cb9453a8494b7;hpb=a97d4f54eb576a7c72e933fb3af992e9de8e5473;p=anna.git

diff --git a/SConstruct b/SConstruct
index 8083387..517b1a6 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1,4 +1,5 @@
 import os
+import sys, select
 
 # Basic paths
 prefix = ARGUMENTS.get ('prefix', "/usr/local")
@@ -18,7 +19,27 @@ target_opt_bin = os.path.join (opt_bin, "anna")
 release = ARGUMENTS.get ('release', 0)
 
 # Environment
-env = Environment ()
+env = None
+rc = os.system("clang++ --version >/dev/null 2>/dev/null")
+if rc == 0: 
+  print "\nDetected clang++ installed in the system"
+  print "\nSelect compiler:\n  1. g++\n  2. clang++"
+  #option = raw_input("\nInput option [1]: ") or "1"
+  # Read with timeout:
+  print "\nInput option [1]: "
+  option = 1
+  i, o, e = select.select( [sys.stdin], [], [], 60 )
+  if (i): option = sys.stdin.readline().strip()
+  else: print "expired! using default ..."
+  if option == "2":
+    env = Environment(CXX = 'clang++')
+    env.Append (CCFLAGS = '-DIS_CLANG')
+    env.Append (CXXFLAGS = '-Wno-parentheses-equality')
+  else:
+    env = Environment()
+else:
+  env = Environment()
+
 #oracle_includes = os.environ["ORACLE_HOME"] + "/include"
 oracle_includes = "/usr/lib/oracle/12.1/client64/include"
         
@@ -42,7 +63,7 @@ libraries = []
 env.Append (CPPPATH = [source_include, usr_local_include, usr_include ])
 #env.Append (CCFLAGS = '-std=c++0x')
 # C++11 support:
-#env.Append (CXXFLAGS = '-std=c++11')
+env.Append (CXXFLAGS = '-std=c++11')
 
 env.Append (LIBS = [''])
 # scons -Q release=1
@@ -52,7 +73,7 @@ if int(release):
   env.Append (VARIANT = variant)
 else:
   variant='debug'
-  env.Append (CCFLAGS = '-g -O0 -D_DEBUG')
+  env.Append (CCFLAGS = '-g -O0')
   env.Append (LIBPATH = os.path.join (current_directory, variant))
   env.Append (VARIANT = variant)