build: fix library version and compile flags on Android · nodejs/node@65e67cb · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 633
• Pull requests 757
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 65e67cb

Browse filesBrowse the repository at this point in the historyBrowse files

gcampax

authored and

targos

committed

build: fix library version and compile flags on Android

Compiling a library with -fPIE won't do, and on Android libraries are not versioned. PR-URL: #29388 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>

1 parent 70dc7a2 commit 65e67cb
Copy full SHA for 65e67cb

2 files changed

+9-6Lines changed: 9 additions & 6 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• common.gypi
• configure.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎common.gypi‎

Copy file name to clipboardExpand all lines: common.gypi

+4-4Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
@@ -161,8 +161,8 @@
161	161	'ldflags': [ '-Wl,-bbigtoc' ],
162	162	}],
163	163	['OS == "android"', {
164		- 'cflags': [ '-fPIE' ],
165		- 'ldflags': [ '-fPIE', '-pie' ]
	164	+ 'cflags': [ '-fPIC' ],
	165	+ 'ldflags': [ '-fPIC' ]
166	166	}],
167	167	],
168	168	'msvs_settings': {
@@ -221,8 +221,8 @@
221	221	],
222	222	},],
223	223	['OS == "android"', {
224		- 'cflags': [ '-fPIE' ],
225		- 'ldflags': [ '-fPIE', '-pie' ]
	224	+ 'cflags': [ '-fPIC' ],
	225	+ 'ldflags': [ '-fPIC' ]
226	226	}],
227	227	],
228	228	'msvs_settings': {

Collapse file

‎configure.py‎

Copy file name to clipboardExpand all lines: configure.py

+5-2Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -1089,14 +1089,17 @@ def configure_node(o):
1089	1089	o['variables']['node_shared'] = b(options.shared)
1090	1090	node_module_version = getmoduleversion.get_version()
1091	1091
1092		- if sys.platform == 'darwin':
	1092	+ if options.dest_os == 'android':
	1093	+ shlib_suffix = 'so'
	1094	+ elif sys.platform == 'darwin':
1093	1095	shlib_suffix = '%s.dylib'
1094	1096	elif sys.platform.startswith('aix'):
1095	1097	shlib_suffix = '%s.a'
1096	1098	else:
1097	1099	shlib_suffix = 'so.%s'
	1100	+ if '%s' in shlib_suffix:
	1101	+ shlib_suffix %= node_module_version
1098	1102
1099		- shlib_suffix %= node_module_version
1100	1103	o['variables']['node_module_version'] = int(node_module_version)
1101	1104	o['variables']['shlib_suffix'] = shlib_suffix
1102	1105

0 commit comments

Comments

0 (0)