Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(291)

Unified Diff: SConstruct

Issue 3173010: [minijail] Update to new libchrome API (Closed) Base URL: http://src.chromium.org/git/minijail.git
Patch Set: Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | minijail_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: SConstruct
diff --git a/SConstruct b/SConstruct
index dc32ec3eb26792c7b8e88315c5e6bda5edffbabf..d0f2d6d7fa2f4a8e619a2ab10f5b9a273abbbe0f 100644
--- a/SConstruct
+++ b/SConstruct
@@ -23,8 +23,10 @@ env.Append(
CPPPATH=['..', '../../third_party/chrome/files', '../../common'],
CCFLAGS=['-g'],
LIBPATH=['../../third_party/chrome'],
- LIBS=['cap', 'base', 'pthread', 'rt'],
+ LIBS=['cap', 'glib-2.0', 'base', 'pthread', 'rt'],
)
+# glib-2.0 is only required by libbase
+
for key in Split('CC CXX AR RANLIB LD NM CFLAGS CCFLAGS'):
value = os.environ.get(key)
if value != None:
@@ -32,10 +34,12 @@ for key in Split('CC CXX AR RANLIB LD NM CFLAGS CCFLAGS'):
env['CCFLAGS'] += ['-fno-exceptions', '-Wall', '-Werror']
# Fix issue with scons not passing some vars through the environment.
-for key in Split('PKG_CONFIG_LIBDIR PKG_CONFIG_PATH SYSROOT'):
+for key in Split('PKG_CONFIG SYSROOT'):
if os.environ.has_key(key):
env['ENV'][key] = os.environ[key]
+env.ParseConfig('%s --cflags --libs glib-2.0' % env['ENV']['PKG_CONFIG'])
+
env_lib = env.Clone()
env_lib.SharedLibrary('minijail', lib_sources)
« no previous file with comments | « no previous file | minijail_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698