diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-02-06 12:02:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-06 12:02:47 +0100 |
| commit | 389c60da5e01761f4a11ef539ffa26e4c1b17875 (patch) | |
| tree | c6033924a0de9be1ab140596e305898c651bf57e /security/nss/lib/jar | |
| parent | 7c9b585349c985df0cf6ace83da5dadba8b5c677 (diff) | |
| parent | f017b749ea9f1586d2308504553d40bf4cc5439d (diff) | |
| download | UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.tar UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.tar.gz UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.tar.lz UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.tar.xz UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.zip | |
Merge pull request #13 from MoonchildProductions/ported-upstream
Ported upstream
Diffstat (limited to 'security/nss/lib/jar')
| -rw-r--r-- | security/nss/lib/jar/jar.gyp | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/security/nss/lib/jar/jar.gyp b/security/nss/lib/jar/jar.gyp index e38b4ab99..ee8734aca 100644 --- a/security/nss/lib/jar/jar.gyp +++ b/security/nss/lib/jar/jar.gyp @@ -26,49 +26,6 @@ 'defines': [ 'MOZILLA_CLIENT=1', ], - 'conditions': [ - [ 'OS=="win"', { - 'configurations': { - 'x86_Base': { - 'msvs_settings': { - 'VCCLCompilerTool': { - 'PreprocessorDefinitions': [ - 'NSS_X86_OR_X64', - 'NSS_X86', - ], - }, - }, - }, - 'x64_Base': { - 'msvs_settings': { - 'VCCLCompilerTool': { - 'PreprocessorDefinitions': [ - 'NSS_USE_64', - 'NSS_X86_OR_X64', - 'NSS_X64', - ], - }, - }, - }, - }, - }, { - 'conditions': [ - [ 'target_arch=="x64"', { - 'defines': [ - 'NSS_USE_64', - 'NSS_X86_OR_X64', - 'NSS_X64', - ], - }], - [ 'target_arch=="ia32"', { - 'defines': [ - 'NSS_X86_OR_X64', - 'NSS_X86', - ], - }], - ], - }], - ], }, 'variables': { 'module': 'nss' |