Skip to content

Commit

Permalink
Merge r163954 - 'ar T' is not portable and breaks the build on FreeBSD
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=128596

Patch by Ryan Lortie <desrt@desrt.ca> on 2014-02-12
Reviewed by Gustavo Noronha Silva.

Create thin archives only if we are using GNU ar.

* Source/autotools/SetupLibtool.m4:
  • Loading branch information
allisonkarlitskaya authored and carlosgcampos committed Feb 17, 2014
1 parent 97ef36d commit f5ecfad
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
11 changes: 11 additions & 0 deletions ChangeLog
@@ -1,3 +1,14 @@
2014-02-12 Ryan Lortie <desrt@desrt.ca>

'ar T' is not portable and breaks the build on FreeBSD
https://bugs.webkit.org/show_bug.cgi?id=128596

Reviewed by Gustavo Noronha Silva.

Create thin archives only if we are using GNU ar.

* Source/autotools/SetupLibtool.m4:

2014-02-09 Carlos Garnacho <carlosg@gnome.org>

[GTK] Enable touch features
Expand Down
6 changes: 5 additions & 1 deletion Source/autotools/SetupLibtool.m4
Expand Up @@ -6,7 +6,11 @@ AC_SUBST([LIBJAVASCRIPTCOREGTK_VERSION])
AC_SUBST([LIBWEBKIT2GTK_VERSION])

if test -z "$AR_FLAGS"; then
AR_FLAGS="cruT"
if "${AR:-ar}" -V | grep -q 'GNU ar'; then
AR_FLAGS="cruT"
else
AR_FLAGS="cru"
fi
fi
AC_SUBST([AR_FLAGS])

Expand Down

0 comments on commit f5ecfad

Please sign in to comment.