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

Unified Diff: src/platform/update_engine/SConstruct

Issue 524073: Consistently pass through PKG_CONFIG_LIBDIR environment variable (Closed)
Patch Set: Created 10 years, 11 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
Index: src/platform/update_engine/SConstruct
diff --git a/src/platform/update_engine/SConstruct b/src/platform/update_engine/SConstruct
index 0d124d96b6336187b950cfe591dfe45e45da73a0..c80ceeb75e7dfcb7ebe1cf95c9ecd0fa6930dbc6 100644
--- a/src/platform/update_engine/SConstruct
+++ b/src/platform/update_engine/SConstruct
@@ -67,6 +67,12 @@ env['LIBS'] = Split("""base
env['CPPPATH'] = ['..', '../../third_party/chrome/files', '../../common']
env['LIBPATH'] = ['../../third_party/chrome']
env['BUILDERS']['ProtocolBuffer'] = proto_builder
+
+# Fix up the pkg-config path if it is present in the environment.
+for key in Split('PKG_CONFIG_LIBDIR PKG_CONFIG_PATH'):
+ if os.environ.has_key(key):
+ env['ENV'][key] = os.environ[key]
+
env.ParseConfig('pkg-config --cflags --libs glib-2.0')
env.ProtocolBuffer('update_metadata.pb.cc', 'update_metadata.proto')

Powered by Google App Engine
This is Rietveld 408576698