From 01b3eac52f810b61dc2d5f0ea7a2bfa229daa01f Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Tue, 3 May 2016 16:56:51 -0700 Subject: [PATCH] [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. --- binding.gyp | 8 ++++---- platform/android/platform.gyp | 12 ++++++------ platform/linux/platform.gyp | 14 +++++++------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/binding.gyp b/binding.gyp index a0fe62c8d..3e7f9a452 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 ce243e493..8336bd5c9 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 236f0619f..4791ba30c 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)', ], },