Fix spurious warnings and workaround possible aliasing porblems (-fno-strict-aliasing)

[senf.git] / site_scons / site_init.py

diff --git a/site_scons/site_init.py b/site_scons/site_init.py
index dac80c8..9c2baac 100644 (file)
--- a/site_scons/site_init.py
+++ b/site_scons/site_init.py
@@ -1,9 +1,11 @@
 import os.path, SCons
+import inspect
 
 # SCons is at     #/tools/scons-<v>/engine/SCons/__init__.py
 # site_init is at #/site_scons/site_init.py
 
-sconsbase = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))),"tools")
+sconsbase = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(
+    inspect.currentframe().f_code.co_filename))),"tools")
 sconsbase = os.path.join(
     sconsbase,sorted((f for f in os.listdir(sconsbase) if f.startswith("scons-")))[-1])
 sconsengine = os.path.join(sconsbase, 'engine')
@@ -43,7 +45,7 @@ if os.path.dirname(os.path.dirname(os.path.abspath(SCons.__file__))) != sconseng
     cdir = os.path.normpath(cdir)
     if cdir.startswith('../'):
         SCons.Util.display("scons: WARNING: failed to undo -C option")
-    elif cdir != '.':
+    elif cdir != '.' and not cdir.startswith('/'):
         os.chdir('/'.join(('..' for _ in cdir.split('/'))))
     os.environ['SCONS_LIB_DIR'] = sconsengine
     os.execv(sconsscript, sys.argv)