Commit54c99c3

petere

authored and

pull[bot]

committed

Remove further unwanted linker flags from perl_embed_ldflags

Remove the contents of $Config{ldflags} from ExtUtils::Embed's ldopts,like we already do with $Config{ccdlflags}. Those flags are thechoices of those who built the Perl installation, which are notnecessarily appropriate for building PostgreSQL. What we really wantfrom ldopts are the options identifying the location and name of thelibperl library, but unfortunately it doesn't appear possible to getthat separately from the other stuff.The motivation for this was to strip -mmacosx-version-min options. Wealready did something similar for the -arch option. Both of those arenow covered by this more general approach.Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>Reviewed-by: Andres Freund <andres@anarazel.de>Discussion:https://www.postgresql.org/message-id/flat/8c4fcb72-2574-ff7c-4c25-1f032d4a2a57%40enterprisedb.com

1 parentd094d54 commit54c99c3Copy full SHA for 54c99c3

File tree

2 files changed

-7

lines changed

config
- perl.m4
configure

2 files changed

-7

lines changed

`‎config/perl.m4`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -81,9 +81,9 @@ AC_MSG_RESULT([$perl_embed_ccflags])`
`81`	`81`	`# PGAC_CHECK_PERL_EMBED_LDFLAGS`
`82`	`82`	`# -----------------------------`
`83`	`83`	`# We are after Embed's ldopts, but without the subset mentioned in`
`84`		`-# Config's ccdlflags; andalso without any -arch flags, which recent`
`85`		`-#Apple releases put in unhelpfully. (If you want a multiarch build`
`86`		`-#you'd better be specifying it in more places than plperl's final link.)`
	`84`	`+# Config's ccdlflags andldflags. (Those are the choices of those who`
	`85`	`+#built the Perl installation, which are not necessarily appropriate`
	`86`	`+#for building PostgreSQL.)`
`87`	`87`	`AC_DEFUN([PGAC_CHECK_PERL_EMBED_LDFLAGS],`
`88`	`88`	`[AC_REQUIRE([PGAC_PATH_PERL])`
`89`	`89`	`AC_MSG_CHECKING(forflagstolinkembeddedPerl)`
`@@ -99,8 +99,8 @@ if test "$PORTNAME" = "win32" ; then`
`99`	`99`	`fi`
`100`	`100`	`else`
`101`	`101`	pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
`102`		-pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
`103`		-perl_embed_ldflags=`echo X"$pgac_tmp1" \| sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e["s/ -arch[-a-zA-Z0-9_]*//g"]`
	`102`	+pgac_tmp2=`$PERL -MConfig -e 'print"$Config{ccdlflags} $Config{ldflags}"'`
	`103`	+perl_embed_ldflags=`echo X"$pgac_tmp1" \| sed -e "s/^X//" -e "s%$pgac_tmp2%%"`
`104`	`104`	`fi`
`105`	`105`	`AC_SUBST(perl_embed_ldflags)dnl`
`106`	`106`	`if test -z "$perl_embed_ldflags" ; then`

`‎configure`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -10477,8 +10477,8 @@ if test "$PORTNAME" = "win32" ; then`
`10477`	`10477`	`fi`
`10478`	`10478`	`else`
`10479`	`10479`	pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
`10480`		-pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
`10481`		-perl_embed_ldflags=`echo X"$pgac_tmp1" \| sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e "s/ -arch [-a-zA-Z0-9_]*//g"`
	`10480`	+pgac_tmp2=`$PERL -MConfig -e 'print"$Config{ccdlflags} $Config{ldflags}"'`
	`10481`	+perl_embed_ldflags=`echo X"$pgac_tmp1" \| sed -e "s/^X//" -e "s%$pgac_tmp2%%"`
`10482`	`10482`	`fi`
`10483`	`10483`	`if test -z "$perl_embed_ldflags" ; then`
`10484`	`10484`	`{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5`

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!

Commit54c99c3

File tree

2 files changed

2 files changed

`‎config/perl.m4`

`‎configure`

0 commit comments