SCons: Add new DAQconfig class (commit 8a184a6). Fix library RPATH on…

… macOS.
JeffersonLab · Sep 8, 2022 · 94bb0d2 · 94bb0d2
1 parent 9764632
commit 94bb0d2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/hana_decode/SConscript.py b/hana_decode/SConscript.py
@@ -15,6 +15,7 @@
 Caen775Module.cxx
 Caen792Module.cxx
 CodaDecoder.cxx
+DAQconfig.cxx
 F1TDCModule.cxx
 Fadc250Module.cxx
 FastbusModule.cxx

diff --git a/site_scons/linux32.py b/site_scons/linux32.py
@@ -18,7 +18,7 @@ def config(env,args):
     cxxversion = env.subst('$CXXVERSION')
 
     if float(cxxversion[0:2])>=4.0:
-        env.Append(CXXFLAGS = env.Split('-Wextra -Wno-missing-field-initializers'))
+        env.Append(CXXFLAGS = env.Split('-Wextra -Wno-missing-field-initializers -Wno-maybe-uninitialized'))
         if not int(debug):
             env.Append(CXXFLAGS = '-Wno-unused-parameter')
 

diff --git a/site_scons/linux64.py b/site_scons/linux64.py
@@ -18,7 +18,7 @@ def config(env,args):
     cxxversion = env.subst('$CXXVERSION')
 
     if float(cxxversion[0:2])>=4.0:
-        env.Append(CXXFLAGS = env.Split('-Wextra -Wno-missing-field-initializers'))
+        env.Append(CXXFLAGS = env.Split('-Wextra -Wno-missing-field-initializers -Wno-maybe-uninitialized'))
         if not int(debug):
             env.Append(CXXFLAGS = '-Wno-unused-parameter')
 

diff --git a/site_scons/podd_util.py b/site_scons/podd_util.py
@@ -156,12 +156,11 @@ def build_library(env, sotarget, src, extrahdrs = [], extradicthdrs = [],
         if versioned:
             shlinkflags.append('-Wl,-compatibility_version,'+env.subst('$SOVERSION'))
             shlinkflags.append('-Wl,-current_version,'+env.subst('$VERSION'))
-        # SCons (as of version 4?) now seems to do this for us
-        # try:
-        #     for rp in env['RPATH']:
-        #         shlinkflags.append('-Wl,-rpath,'+rp)
-        # except KeyError:
-        #     pass
+        try:
+            for rp in env['RPATH']:
+                shlinkflags.append('-Wl,-rpath,'+rp)
+        except KeyError:
+            pass
     else:
         print('build_library: Error: unsupported platform')
         Exit(3)