[build] '<@(foo_static_libs)' must precede '<@(foo_ldflags)'

'<@(foo_ldflags)' typically includes -lbar arguments that the static libs depend on, and order matters for ld.

The build was previously working merely by lucky ordering.
This commit is contained in:
John Firebaugh
2016-05-03 16:56:51 -07:00
parent e8e709d96d
commit 01b3eac52f
3 changed files with 17 additions and 17 deletions

View File

@@ -67,14 +67,14 @@
'link_settings': {
'libraries': [
'<@(nunicode_ldflags)',
'<@(nunicode_static_libs)',
'<@(webp_ldflags)',
'<@(nunicode_ldflags)',
'<@(webp_static_libs)',
'<@(libpng_ldflags)',
'<@(webp_ldflags)',
'<@(libpng_static_libs)',
'<@(libjpeg-turbo_ldflags)',
'<@(libpng_ldflags)',
'<@(libjpeg-turbo_static_libs)',
'<@(libjpeg-turbo_ldflags)',
],
},
}]

View File

@@ -65,18 +65,18 @@
'-lGLESv2',
'-lstdc++',
'-latomic',
'<@(nunicode_ldflags)',
'<@(nunicode_static_libs)',
'<@(sqlite_ldflags)',
'<@(nunicode_ldflags)',
'<@(sqlite_static_libs)',
'<@(zlib_ldflags)',
'<@(sqlite_ldflags)',
'<@(zlib_static_libs)',
'<@(libzip_ldflags)',
'<@(zlib_ldflags)',
'<@(libzip_static_libs)',
'<@(libpng_ldflags)',
'<@(libzip_ldflags)',
'<@(libpng_static_libs)',
'<@(libjpeg-turbo_ldflags)',
'<@(libpng_ldflags)',
'<@(libjpeg-turbo_static_libs)',
'<@(libjpeg-turbo_ldflags)',
],
},
},

View File

@@ -83,20 +83,20 @@
'link_settings': {
'libraries': [
'<@(nunicode_ldflags)',
'<@(nunicode_static_libs)',
'<@(sqlite_ldflags)',
'<@(nunicode_ldflags)',
'<@(sqlite_static_libs)',
'<@(zlib_ldflags)',
'<@(sqlite_ldflags)',
'<@(zlib_static_libs)',
'<@(libcurl_ldflags)',
'<@(zlib_ldflags)',
'<@(libcurl_static_libs)',
'<@(libpng_ldflags)',
'<@(libcurl_ldflags)',
'<@(libpng_static_libs)',
'<@(libjpeg-turbo_ldflags)',
'<@(libpng_ldflags)',
'<@(libjpeg-turbo_static_libs)',
'<@(webp_ldflags)',
'<@(libjpeg-turbo_ldflags)',
'<@(webp_static_libs)',
'<@(webp_ldflags)',
],
},