diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-05-03 16:56:51 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-05-03 16:59:04 -0700 |
| commit | 01b3eac52f810b61dc2d5f0ea7a2bfa229daa01f (patch) | |
| tree | ecf23b7c35f84b0f646da67fec3ea8f55f0c7d79 | |
| parent | e8e709d96d6034afcb149b269b9208ea12fb3308 (diff) | |
| download | qtlocation-mapboxgl-01b3eac52f810b61dc2d5f0ea7a2bfa229daa01f.tar.gz | |
[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.
| -rw-r--r-- | binding.gyp | 8 | ||||
| -rw-r--r-- | platform/android/platform.gyp | 12 | ||||
| -rw-r--r-- | platform/linux/platform.gyp | 14 |
3 files changed, 17 insertions, 17 deletions
diff --git a/binding.gyp b/binding.gyp index a0fe62c8db..3e7f9a452a 100644 --- a/binding.gyp +++ b/binding.gyp @@ -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)', ], }, }] diff --git a/platform/android/platform.gyp b/platform/android/platform.gyp index ce243e493e..8336bd5c98 100644 --- a/platform/android/platform.gyp +++ b/platform/android/platform.gyp @@ -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)', ], }, }, diff --git a/platform/linux/platform.gyp b/platform/linux/platform.gyp index 236f0619f7..4791ba30c4 100644 --- a/platform/linux/platform.gyp +++ b/platform/linux/platform.gyp @@ -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)', ], }, |