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/gtests/google_test/google_test.gyp | |
| 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/gtests/google_test/google_test.gyp')
| -rw-r--r-- | security/nss/gtests/google_test/google_test.gyp | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/security/nss/gtests/google_test/google_test.gyp b/security/nss/gtests/google_test/google_test.gyp index e309ba25a..b3a11b7af 100644 --- a/security/nss/gtests/google_test/google_test.gyp +++ b/security/nss/gtests/google_test/google_test.gyp @@ -13,43 +13,10 @@ 'sources': [ 'gtest/src/gtest-all.cc' ], - 'dependencies': [ - '<(DEPTH)/lib/nss/nss.gyp:nss3', - '<(DEPTH)/lib/util/util.gyp:nssutil3', - '<(DEPTH)/lib/smime/smime.gyp:smime3', - '<(DEPTH)/lib/ssl/ssl.gyp:ssl3', - '<(DEPTH)/cmd/lib/lib.gyp:sectool' - ] }, - { - 'target_name': 'gtest1', - 'type': 'shared_library', - 'dependencies': [ - 'gtest' - ], - # Work around a gyp bug. Fixed upstream in gyp: - # https://chromium.googlesource.com/external/gyp/+/93cc6e2c23e4d5ebd179f388e67aa907d0dfd43d - 'conditions': [ - ['OS!="win"', { - 'libraries': [ - '-lstdc++', - ], - }], - ], - # For some reason when just linking static libraries into - # a DLL the link fails without this. - 'msvs_settings': { - 'VCLinkerTool': { - 'AdditionalDependencies': [ - '/DEFAULTLIB:MSVCRT', - ], - }, - }, - } ], 'target_defaults': { 'include_dirs': [ - 'gtest/include/', 'gtest' ], }, |