fdo-mirrors/pkg-config
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pkg-config/pkg-config.git synced 2025-12-20 05:30:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Also match -Wl,-framework for OSX framework

Browse source 
Freedesktop #1278 (https://bugs.freedesktop.org/show_bug.cgi?id=1278)
This commit is contained in:
Dan Nicholson 2014-09-27 17:07:31 -07:00
parent ae0a8b1ad5
commit 8d19fad1a0
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
check/check-special-flags
View file

@ -7,5 +7,5 @@ set -e
RESULT="-isystem /system1 -idirafter /after1 -idirafter /after2 -isystem /system2 -I/foo -I/bar"
run_test --cflags special-flags
RESULT="-framework Foo -lsimple -framework Bar"
RESULT="-framework Foo -lsimple -framework Bar -Wl,-framework -Wl,Baz"
run_test --libs special-flags

2
check/special-flags.pc
View file

@ -7,5 +7,5 @@ Name: Special flags test
Description: Dummy pkgconfig test package for testing pkgconfig
Version: 1.0.0
Requires:
Libs: -framework Foo -lsimple -framework Bar
Libs: -framework Foo -lsimple -framework Bar -Wl,-framework -Wl,Baz
Cflags: -I/foo -isystem /system1 -idirafter /after1 -I/bar -idirafter /after2 -isystem /system2

4
parse.c
View file

@ -665,7 +665,9 @@ static void _do_parse_libs (Package *pkg, int argc, char **argv)
flag->arg = g_strconcat (L_flag, p, NULL);
pkg->libs = g_list_prepend (pkg->libs, flag);
}
else if (strcmp("-framework",p) == 0 && i+1 < argc)
else if ((strcmp("-framework", p) == 0 ||
strcmp("-Wl,-framework", p) == 0) &&
i+1 < argc)
{
/* Mac OS X has a -framework Foo which is really one option,
* so we join those to avoid having -framework Foo