From 07b15bdfc1093987a23a211517b7341f0b3d453d Mon Sep 17 00:00:00 2001 From: "jkummerow@chromium.org" Date: Fri, 4 Oct 2013 11:57:42 +0000 Subject: [PATCH] Explicitly include defaults.cc in the shared_library gyp target. Explicitly include defaults.cc in the shared_library gyp target, otherwise the whole compilation unit is stripped by the Windows linker, since none of it's symbols are referenced by any other compilation unit in V8. BUG=None R=jkummerow@chromium.org Review URL: https://codereview.chromium.org/25994002 Patch from Ross McIlroy . git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@17107 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/defaults.cc | 3 +++ tools/gyp/v8.gyp | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/src/defaults.cc b/src/defaults.cc index eb9e0deab0..cbbe53729e 100644 --- a/src/defaults.cc +++ b/src/defaults.cc @@ -25,6 +25,9 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// The GYP based build ends up defining USING_V8_SHARED when compiling this +// file. +#undef USING_V8_SHARED #include "../include/v8-defaults.h" #include "platform.h" diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp index 846472dc2d..83549ddf6c 100644 --- a/tools/gyp/v8.gyp +++ b/tools/gyp/v8.gyp @@ -61,6 +61,10 @@ # Note: on non-Windows we still build this file so that gyp # has some sources to link into the component. '../../src/v8dll-main.cc', + '../../src/defaults.cc', + ], + 'include_dirs': [ + '../../include', ], 'defines': [ 'V8_SHARED',