166 lines
4.3 KiB
Diff
166 lines
4.3 KiB
Diff
From 5f390ae5e8857ad8c4d0a8b00818eadd8d8f4daa Mon Sep 17 00:00:00 2001
|
|
From: Alethea Rose <alethea@alethearose.com>
|
|
Date: Tue, 14 Feb 2017 23:11:03 -0500
|
|
Subject: [PATCH 05/23] Remove .lib suffix on linked libraries
|
|
|
|
---
|
|
deps/v8/BUILD.gn | 8 ++++----
|
|
node.gyp | 32 ++++++++++++++++----------------
|
|
tools/v8_gypfiles/v8.gyp | 38 +++++++++++++++++---------------------
|
|
3 files changed, 37 insertions(+), 41 deletions(-)
|
|
|
|
diff --git a/deps/v8/BUILD.gn b/deps/v8/BUILD.gn
|
|
index 988c907d..62bf94b2 100644
|
|
--- a/deps/v8/BUILD.gn
|
|
+++ b/deps/v8/BUILD.gn
|
|
@@ -5312,13 +5312,13 @@ v8_component("v8_libbase") {
|
|
defines += [ "_CRT_RAND_S" ] # for rand_s()
|
|
|
|
libs = [
|
|
- "dbghelp.lib",
|
|
- "winmm.lib",
|
|
- "ws2_32.lib",
|
|
+ "dbghelp",
|
|
+ "winmm",
|
|
+ "ws2_32",
|
|
]
|
|
|
|
if (v8_enable_system_instrumentation) {
|
|
- libs += [ "advapi32.lib" ] # Needed for TraceLoggingProvider.h
|
|
+ libs += [ "advapi32" ] # Needed for TraceLoggingProvider.h
|
|
}
|
|
|
|
data_deps += [ "//build/win:runtime_libs" ]
|
|
diff --git a/node.gyp b/node.gyp
|
|
index 6b554d75..e8e086fa 100644
|
|
--- a/node.gyp
|
|
+++ b/node.gyp
|
|
@@ -277,9 +277,9 @@
|
|
}],
|
|
['OS=="win"', {
|
|
'libraries': [
|
|
- 'Dbghelp.lib',
|
|
- 'winmm.lib',
|
|
- 'Ws2_32.lib',
|
|
+ '-ldbghelp',
|
|
+ '-lwinmm',
|
|
+ '-lws2_32',
|
|
],
|
|
}],
|
|
['node_with_ltcg=="true"', {
|
|
@@ -765,10 +765,10 @@
|
|
}],
|
|
],
|
|
'libraries': [
|
|
- 'Dbghelp',
|
|
- 'Psapi',
|
|
- 'Winmm',
|
|
- 'Ws2_32',
|
|
+ '-ldbghelp',
|
|
+ '-lpsapi',
|
|
+ '-lwinmm',
|
|
+ '-lws2_32',
|
|
],
|
|
}],
|
|
[ 'node_use_etw=="true"', {
|
|
@@ -1305,9 +1305,9 @@
|
|
}],
|
|
['OS=="win"', {
|
|
'libraries': [
|
|
- 'Dbghelp.lib',
|
|
- 'winmm.lib',
|
|
- 'Ws2_32.lib',
|
|
+ '-ldbghelp',
|
|
+ '-lwinmm',
|
|
+ '-lws2_32',
|
|
],
|
|
}],
|
|
# Avoid excessive LTO
|
|
@@ -1365,9 +1365,9 @@
|
|
}],
|
|
['OS=="win"', {
|
|
'libraries': [
|
|
- 'Dbghelp.lib',
|
|
- 'winmm.lib',
|
|
- 'Ws2_32.lib',
|
|
+ '-ldbghelp',
|
|
+ '-lwinmm',
|
|
+ '-lws2_32',
|
|
],
|
|
}],
|
|
# Avoid excessive LTO
|
|
@@ -1447,9 +1447,9 @@
|
|
}],
|
|
['OS=="win"', {
|
|
'libraries': [
|
|
- 'Dbghelp.lib',
|
|
- 'winmm.lib',
|
|
- 'Ws2_32.lib',
|
|
+ '-ldbghelp',
|
|
+ '-lwinmm',
|
|
+ '-lws2_32',
|
|
],
|
|
}],
|
|
# Avoid excessive LTO
|
|
diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
|
|
index ba8b161f..d13f74c3 100644
|
|
--- a/tools/v8_gypfiles/v8.gyp
|
|
+++ b/tools/v8_gypfiles/v8.gyp
|
|
@@ -1166,23 +1166,19 @@
|
|
],
|
|
'defines': ['_CRT_RAND_S'], # for rand_s()
|
|
'direct_dependent_settings': {
|
|
- 'msvs_settings': {
|
|
- 'VCLinkerTool': {
|
|
- 'AdditionalDependencies': [
|
|
- 'dbghelp.lib',
|
|
- 'winmm.lib',
|
|
- 'ws2_32.lib'
|
|
- ]
|
|
- }
|
|
+ 'link_settings': {
|
|
+ 'libraries': [
|
|
+ '-ldbghelp',
|
|
+ '-lwinmm',
|
|
+ '-lws2_32'
|
|
+ ],
|
|
},
|
|
'conditions': [
|
|
['v8_enable_system_instrumentation==1', {
|
|
- 'msvs_settings': {
|
|
- 'VCLinkerTool': {
|
|
- 'AdditionalDependencies': [
|
|
- 'advapi32.lib',
|
|
- ],
|
|
- },
|
|
+ 'link_settings': {
|
|
+ 'libraries': [
|
|
+ '-ladvapi32',
|
|
+ ],
|
|
},
|
|
}],
|
|
],
|
|
@@ -1485,13 +1481,13 @@
|
|
'RuntimeTypeInfo': 'true',
|
|
'ExceptionHandling': 1,
|
|
},
|
|
- 'VCLinkerTool': {
|
|
- 'AdditionalDependencies': [
|
|
- 'dbghelp.lib',
|
|
- 'winmm.lib',
|
|
- 'ws2_32.lib'
|
|
- ]
|
|
- }
|
|
+ },
|
|
+ 'link_settings': {
|
|
+ 'libraries': [
|
|
+ '-ldbghelp',
|
|
+ '-lwinmm',
|
|
+ '-lws2_32'
|
|
+ ],
|
|
},
|
|
'sources': [
|
|
"<(V8_ROOT)/src/torque/torque.cc",
|
|
--
|
|
2.17.0.windows.1
|