diff --git a/src/arch/arm/fastmodel/SConscript b/src/arch/arm/fastmodel/SConscript
index 00aec9394f..32faa3cfeb 100644
--- a/src/arch/arm/fastmodel/SConscript
+++ b/src/arch/arm/fastmodel/SConscript
@@ -140,15 +140,12 @@ fm_static_libs = (
     'fmruntime',
     'IrisSupport',
 )
-env.Append(LIBS=list(staticify(env, lib) for lib in fm_static_libs))
-
-system_libs = (
-    'atomic',
-    'dl',
-    'rt',
-)
-env.Append(LIBS=system_libs)
+for lib in fm_static_libs:
+    SourceLib(staticify(env, lib))
 
+SourceLib('atomic')
+SourceLib('dl')
+SourceLib('rt')
 
 class ProjectFileParser(Grammar):
     class Param(object):
diff --git a/src/base/SConscript b/src/base/SConscript
index 21ebde9928..574a64f940 100644
--- a/src/base/SConscript
+++ b/src/base/SConscript
@@ -48,7 +48,7 @@ else:
     warning("No IEEE FP rounding mode control.\n"
             "FP results may deviate slightly from other platforms.")
 if env['HAVE_PNG']:
-    env.Append(LIBS=['png'])
+    SourceLib('png')
     Source('pngwriter.cc')
 Source('fiber.cc')
 GTest('fiber.test', 'fiber.test.cc', 'fiber.cc')