diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-12-18 13:38:59 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-12-18 13:38:59 +0100 |
| commit | 11ce27f0ddc098f34dcdfd7f3136cdbc961d6b46 (patch) | |
| tree | 8d20f5678a195dfb0c55d94507adde652bf87669 | |
| parent | eea149e73234a34038b45f0f53e207c3bcb3b9e7 (diff) | |
| parent | a3e93d08d49d6242ae359b90c04e5566b28474d8 (diff) | |
| download | UXP-11ce27f0ddc098f34dcdfd7f3136cdbc961d6b46.tar UXP-11ce27f0ddc098f34dcdfd7f3136cdbc961d6b46.tar.gz UXP-11ce27f0ddc098f34dcdfd7f3136cdbc961d6b46.tar.lz UXP-11ce27f0ddc098f34dcdfd7f3136cdbc961d6b46.tar.xz UXP-11ce27f0ddc098f34dcdfd7f3136cdbc961d6b46.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP
| -rw-r--r-- | ipc/chromium/moz.build | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ipc/chromium/moz.build b/ipc/chromium/moz.build index ba5f4e512..dc5b4dca4 100644 --- a/ipc/chromium/moz.build +++ b/ipc/chromium/moz.build @@ -139,13 +139,14 @@ if os_bsd or os_linux or os_solaris: ] if os_solaris: - SOURCES += [ + SOURCES += [ 'src/base/atomicops_internals_x86_gcc.cc', 'src/base/process_util_linux.cc', 'src/base/time_posix.cc', ] - -LOCAL_INCLUDES += ['src/third_party/libevent/linux'] + +elif not CONFIG['MOZ_SYSTEM_LIBEVENT']: + LOCAL_INCLUDES += ['src/third_party/libevent/linux'] ost = CONFIG['OS_TEST'] if '86' not in ost and 'arm' not in ost and 'aarch64' != ost and 'mips' not in ost: |