small scons cleanup (#1858)

SConstruct

@@ -45,15 +45,19 @@ if arch == "aarch64" or arch == "larch64":
   ]
 
   if arch == "larch64":
-    libpath += ["#phonelibs/snpe/larch64"]
+    libpath += [
-    libpath += ["#phonelibs/libyuv/larch64/lib"]
+      "#phonelibs/snpe/larch64",
-    libpath += ["/usr/lib/aarch64-linux-gnu"]
+      "#phonelibs/libyuv/larch64/lib",
+      "/usr/lib/aarch64-linux-gnu"
+    ]
     cflags = ["-DQCOM2", "-mcpu=cortex-a57"]
     cxxflags = ["-DQCOM2", "-mcpu=cortex-a57"]
     rpath = ["/usr/local/lib"]
   else:
-    libpath += ["#phonelibs/snpe/aarch64"]
+    libpath += [
-    libpath += ["#phonelibs/libyuv/lib"]
+      "#phonelibs/snpe/aarch64",
+      "#phonelibs/libyuv/lib"
+    ]
     cflags = ["-DQCOM", "-mcpu=cortex-a57"]
     cxxflags = ["-DQCOM", "-mcpu=cortex-a57"]
     rpath = ["/system/vendor/lib64"]
@@ -81,8 +85,8 @@ else:
       "/usr/local/lib",
       "/System/Library/Frameworks/OpenGL.framework/Libraries",
     ]
-    cflags.append("-DGL_SILENCE_DEPRECATION")
+    cflags += ["-DGL_SILENCE_DEPRECATION"]
-    cxxflags.append("-DGL_SILENCE_DEPRECATION")
+    cxxflags += ["-DGL_SILENCE_DEPRECATION"]
   else:
     libpath = [
       "#phonelibs/snpe/x86_64-linux-clang",
@@ -95,15 +99,20 @@ else:
     ]
 
   rpath = [
-           "external/tensorflow/lib",
+    "external/tensorflow/lib",
-           "cereal",
+    "cereal",
-           "selfdrive/common"]
+    "selfdrive/common"
+  ]
 
   # allows shared libraries to work globally
   rpath = [os.path.join(os.getcwd(), x) for x in rpath]
 
-ccflags_asan = ["-fsanitize=address", "-fno-omit-frame-pointer"] if GetOption('asan') else []
+if GetOption('asan'):
-ldflags_asan = ["-fsanitize=address"] if GetOption('asan') else []
+  ccflags_asan = ["-fsanitize=address", "-fno-omit-frame-pointer"]
+  ldflags_asan = ["-fsanitize=address"]
+else:
+  ccflags_asan = []
+  ldflags_asan = []
 
 # change pythonpath to this
 lenv["PYTHONPATH"] = Dir("#").path
@@ -154,8 +163,7 @@ env = Environment(
 
   CFLAGS=["-std=gnu11"] + cflags,
   CXXFLAGS=["-std=c++14"] + cxxflags,
-  LIBPATH=libpath +
+  LIBPATH=libpath + [
-  [
     "#cereal",
     "#selfdrive/common",
     "#phonelibs",

selfdrive/modeld/SConscript

@@ -9,7 +9,8 @@ common_src = [
   "models/commonmodel.c",
   "runners/snpemodel.cc",
   "transforms/loadyuv.c",
-  "transforms/transform.c"]
+  "transforms/transform.c"
+]
 
 if arch == "aarch64":
   libs += ['gsl', 'CB', 'gnustl_shared']
@@ -24,9 +25,11 @@ else:
 
   # for tensorflow support
   common_src += ['runners/tfmodel.cc']
-  # tell runners to use it
+
+  # tell runners to use tensorflow
   lenv['CFLAGS'].append("-DUSE_TF_MODEL")
   lenv['CXXFLAGS'].append("-DUSE_TF_MODEL")
+
   if arch == "Darwin":
     # fix OpenCL
     del libs[libs.index('OpenCL')]