From e88f61c7ba95fa6db9ed057a27d9903a0abccfe7 Mon Sep 17 00:00:00 2001 From: "ted.mielczarek@gmail.com" Date: Thu, 7 Mar 2013 19:02:46 +0000 Subject: [PATCH] Remove "library" variable A=Thiago Farina BUG=http://code.google.com/p/chromium/issues/detail?id=111541 R=thestig@chromium.org at https://breakpad.appspot.com/537002/ git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1130 4c0a9323-5329-0410-9bdc-e9ce6186880e --- src/client/windows/build/common.gypi | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/client/windows/build/common.gypi b/src/client/windows/build/common.gypi index 23122f72..dfd29bd0 100644 --- a/src/client/windows/build/common.gypi +++ b/src/client/windows/build/common.gypi @@ -199,14 +199,6 @@ # to ~/.gyp/include.gypi, gclient runhooks --force, and do a release build. 'win_use_allocator_shim%': 1, # 0 = shim allocator via libcmt; 1 = msvcrt - # To do a shared build on linux we need to be able to choose between type - # static_library and shared_library. We default to doing a static build - # but you can override this with "gyp -Dlibrary=shared_library" or you - # can add the following line (without the #) to ~/.gyp/include.gypi - # {'variables': {'library': 'shared_library'}} - # to compile as shared by default - 'library%': 'static_library', - # Whether usage of OpenMAX is enabled. 'enable_openmax%': 0, @@ -831,7 +823,7 @@ 'IMPLICIT_COMMAND_DEPENDENCIES': 0, # -rpath is only used when building with shared libraries. 'conditions': [ - [ 'library=="shared_library"', { + [ 'component=="shared_library"', { 'RPATH': '$LIB_DIR', }], ],