diff options
| author | dan sinclair <dsinclair@chromium.org> | 2015-10-15 22:01:23 -0400 |
|---|---|---|
| committer | dan sinclair <dsinclair@chromium.org> | 2015-10-15 22:01:23 -0400 |
| commit | d7426de1486f6cd71235ca482b91fc44cb3b205b (patch) | |
| tree | 26bf408370333c53e12f7ee528eb3db39974c767 /build | |
| parent | ef66fb6d7196993016f0571d4d1253dd78900d2f (diff) | |
| download | pdfium-d7426de1486f6cd71235ca482b91fc44cb3b205b.tar.xz | |
Merge to XFA: Move conditionals inside target_defaults.
This CL moves the conditionals inside the target_defaults configuration. This
causes the -fPIC to get picked up and allows component=shared_library to build
correctly.
Merged clean.
BUG=pdfium:218
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1407903002 .
(cherry picked from commit 26268af2c1242dd173aea6dcbf763a36e734faf3)
Review URL: https://codereview.chromium.org/1412563002 .
Diffstat (limited to 'build')
| -rw-r--r-- | build/standalone.gypi | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/build/standalone.gypi b/build/standalone.gypi index c0eaef419d..507368dc25 100644 --- a/build/standalone.gypi +++ b/build/standalone.gypi @@ -243,15 +243,13 @@ '-Wno-unused-parameter', ], }, - }, - 'conditions': [ - ['component=="shared_library"', { - 'cflags': [ - '-fPIC', - ], - }], - ['OS=="win"', { - 'target_defaults': { + 'conditions': [ + ['component=="shared_library"', { + 'cflags': [ + '-fPIC', + ], + }], + ['OS=="win"', { 'defines': [ 'NOMINMAX', '_CRT_SECURE_NO_DEPRECATE', @@ -264,25 +262,21 @@ ], }], ], - }, - }], # OS=="win" - ['OS=="mac"', { - 'target_defaults': { + }], # OS=="win" + ['OS=="mac"', { 'target_conditions': [ ['_type!="static_library"', { 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']}, }], ], # target_conditions - }, # target_defaults - }], # OS=="mac" - ['v8_use_external_startup_data==1', { - 'target_defaults': { + }], # OS=="mac" + ['v8_use_external_startup_data==1', { 'defines': [ 'V8_USE_EXTERNAL_STARTUP_DATA', ], - }, - }], # v8_use_external_startup_data==1 - ], + }], # v8_use_external_startup_data==1 + ], + }, 'xcode_settings': { # See comment in Chromium's common.gypi for why this is needed. 'SYMROOT': '<(DEPTH)/xcodebuild', |