diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-08 12:55:49 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-08 12:55:49 +0000 |
| commit | 653bd5f03ef74274adbec816df10cdfd046b6eea (patch) | |
| tree | c96f3829422d2fec66cb3a5bc00995bbba914110 /build | |
| parent | 74484851bb8f9f1954014a08c81305e74f9b0bda (diff) | |
| download | chromium_src-653bd5f03ef74274adbec816df10cdfd046b6eea.zip chromium_src-653bd5f03ef74274adbec816df10cdfd046b6eea.tar.gz chromium_src-653bd5f03ef74274adbec816df10cdfd046b6eea.tar.bz2 | |
Basic underpinnings of the gyp equivalent of the Linux SHARED=1 build:
parameterize the 'type' setting of the various library targets, with a
default of 'static_library'.
(Hat tip to Craig Schlenter.)
Review URL: http://codereview.chromium.org/62127
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13345 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 8 | ||||
| -rw-r--r-- | build/temp_gyp/breakpad.gyp | 4 | ||||
| -rw-r--r-- | build/temp_gyp/googleurl.gyp | 2 | ||||
| -rw-r--r-- | build/temp_gyp/v8.gyp | 8 |
4 files changed, 15 insertions, 7 deletions
diff --git a/build/common.gypi b/build/common.gypi index 8279489..a2d9f2b 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -31,6 +31,14 @@ # project file called "coverage". # Currently ignored on Windows. 'coverage%': 0, + + # 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', }, 'target_defaults': { 'conditions': [ diff --git a/build/temp_gyp/breakpad.gyp b/build/temp_gyp/breakpad.gyp index f032446..c4b41bb 100644 --- a/build/temp_gyp/breakpad.gyp +++ b/build/temp_gyp/breakpad.gyp @@ -11,7 +11,7 @@ 'targets': [ { 'target_name': 'breakpad_handler', - 'type': 'static_library', + 'type': '<(library)', 'msvs_guid': 'B55CA863-B374-4BAF-95AC-539E4FA4C90C', 'sources': [ '../../breakpad/src/client/windows/crash_generation/client_info.cc', @@ -45,7 +45,7 @@ }, { 'target_name': 'breakpad_sender', - 'type': 'static_library', + 'type': '<(library)', 'msvs_guid': '9946A048-043B-4F8F-9E07-9297B204714C', 'sources': [ '../../breakpad/src/client/windows/sender/crash_report_sender.cc', diff --git a/build/temp_gyp/googleurl.gyp b/build/temp_gyp/googleurl.gyp index a5e0038..b518e4c 100644 --- a/build/temp_gyp/googleurl.gyp +++ b/build/temp_gyp/googleurl.gyp @@ -13,7 +13,7 @@ 'targets': [ { 'target_name': 'googleurl', - 'type': 'static_library', + 'type': '<(library)', 'msvs_guid': 'EF5E94AB-B646-4E5B-A058-52EF07B8351C', 'dependencies': [ '../../base/base.gyp:base', diff --git a/build/temp_gyp/v8.gyp b/build/temp_gyp/v8.gyp index a64a7ca..2a92aeb 100644 --- a/build/temp_gyp/v8.gyp +++ b/build/temp_gyp/v8.gyp @@ -368,7 +368,7 @@ # Targets to build v8 for the native architecture (ia32). { 'target_name': 'v8_base', - 'type': 'static_library', + 'type': '<(library)', 'include_dirs': [ '../../v8/src', ], @@ -422,7 +422,7 @@ }, { 'target_name': 'v8_nosnapshot', - 'type': 'static_library', + 'type': '<(library)', 'dependencies': [ 'js2c', 'v8_base', @@ -451,7 +451,7 @@ }, { 'target_name': 'v8', - 'type': 'static_library', + 'type': '<(library)', 'dependencies': [ 'js2c', 'mksnapshot', @@ -546,7 +546,7 @@ # (src/simulator-arm.cc). The ARM targets are not snapshot-enabled. { 'target_name': 'v8_arm', - 'type': 'static_library', + 'type': '<(library)', 'dependencies': [ 'js2c', ], |