diff options
| author | spang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-18 22:14:13 +0000 |
|---|---|---|
| committer | spang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-18 22:15:59 +0000 |
| commit | 1d655fe94f4bf017154d9fcc56e375dce491220a (patch) | |
| tree | 5da169a3c6f3bd2b073d10fe5091757b0d00e3ba /build | |
| parent | 1fdcfb56d3e76afa29cfc4ff795ba9c1353b0f54 (diff) | |
| download | chromium_src-1d655fe94f4bf017154d9fcc56e375dce491220a.zip chromium_src-1d655fe94f4bf017154d9fcc56e375dce491220a.tar.gz chromium_src-1d655fe94f4bf017154d9fcc56e375dce491220a.tar.bz2 | |
Make udev target disappear on linux when use_udev==0
So we don't break builds that don't use it by running pkg-config, and so
we don't accidently link against it when it is disabled.
The embedded=1 build has OS=="linux" use_udev==0 for small devices such
as the chromecast.
BUG=403162
Review URL: https://codereview.chromium.org/467983002
Cr-Commit-Position: refs/heads/master@{#290377}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290377 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/linux/system.gyp | 47 |
1 files changed, 25 insertions, 22 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp index e33f22d4..d33bdf4 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -438,6 +438,31 @@ }, ], }], + ['use_udev==1', { + 'targets': [ + { + 'target_name': 'udev', + 'type': 'none', + 'conditions': [ + ['_toolset=="target"', { + 'direct_dependent_settings': { + 'cflags': [ + '<!@(<(pkg-config) --cflags libudev)' + ], + }, + 'link_settings': { + 'ldflags': [ + '<!@(<(pkg-config) --libs-only-L --libs-only-other libudev)', + ], + 'libraries': [ + '<!@(<(pkg-config) --libs-only-l libudev)', + ], + }, + }], + ], + }, + ], + }], ], # conditions 'targets': [ { @@ -1032,27 +1057,5 @@ }], ], }, - { - 'target_name': 'udev', - 'type': 'none', - 'conditions': [ - # libudev is not available on *BSD - ['_toolset=="target" and os_bsd!=1', { - 'direct_dependent_settings': { - 'cflags': [ - '<!@(<(pkg-config) --cflags libudev)' - ], - }, - 'link_settings': { - 'ldflags': [ - '<!@(<(pkg-config) --libs-only-L --libs-only-other libudev)', - ], - 'libraries': [ - '<!@(<(pkg-config) --libs-only-l libudev)', - ], - }, - }], - ], - }, ], } |