NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit24ef127

committed

meson: mingw: Add -Wl,--disable-auto-import, enable when linking with readline

I hadn't ported -Wl,--disable-auto-import over from the win32 template as Ihad focused on msvc for windows. The flag is desirable as it makes it easierto find problems one would have with msvc, particularly useful during crosscompilation.This turned out to be a somewhat happy accident, as it allowed me to realizethat readline actually works on windows these days, as long as auto imports toenable. Therefore enable auto-import again as part of linking to readline.We perhaps can come up with a better solution for the readline issue, but thisseems good enough for now.Discussion:http://postgr.es/m/20220928022724.erzuk5v4ai4b53do@awork3.anarazel.de

1 parent2dc2e4e commit24ef127Copy full SHA for 24ef127

File tree

1 file changed

-0

lines changed

meson.build

1 file changed

-0

lines changed

`‎meson.build`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -279,6 +279,8 @@ elif host_system == 'windows'`
`279`	`279`	`ldflags+='-Wl,--stack,@0@'.format(cdata.get('WIN32_STACK_RLIMIT'))`
`280`	`280`	`# Need to allow multiple definitions, we e.g. want to override getopt.`
`281`	`281`	`ldflags+='-Wl,--allow-multiple-definition'`
	`282`	`+# Ensure we get MSVC-like linking behavior.`
	`283`	`+ ldflags+='-Wl,--disable-auto-import'`
`282`	`284`	`endif`
`283`	`285`
`284`	`286`	`os_deps+= cc.find_library('ws2_32',required:true)`
`@@ -1080,6 +1082,13 @@ Use -Dreadline=false to disable readline support.'''.format(readline_dep))`
`1080`	`1082`	`readline=declare_dependency(dependencies: readline,`
`1081`	`1083`	`include_directories: postgres_inc)`
`1082`	`1084`	`endif`
	`1085`	`+`
	`1086`	`+# On windows with mingw readline requires auto-import to successfully`
	`1087`	`+# link, as the headers don't use declspec(dllimport)`
	`1088`	`+if host_system=='windows'and cc.get_id()!='msvc'`
	`1089`	`+ readline=declare_dependency(dependencies: readline,`
	`1090`	`+link_args:'-Wl,--enable-auto-import')`
	`1091`	`+endif`
`1083`	`1092`	`endif`
`1084`	`1093`
`1085`	`1094`	`# XXX: Figure out whether to implement mingw warning equivalent`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit24ef127

File tree

1 file changed

1 file changed

`‎meson.build`

0 commit comments