diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2016-12-15 16:31:26 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-27 12:32:34 +0000 |
| commit | ebc88886041fb1f38c22e2ef33b17ca1baff7bc8 (patch) | |
| tree | 9612b2486ff94b5b1f5a97c4e3920d9fafdb71c2 /src/tools | |
| parent | bec2be57891f87f2b8bc046bb212be4788f96033 (diff) | |
macOS GN integration
Change-Id: I89850d43c8f11ec54b3a47318ef0b3f083ae3dee
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro b/src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro index 21add0154..7bece36cd 100644 --- a/src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro +++ b/src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro @@ -13,7 +13,12 @@ use?(gn){ isEmpty(NINJA_LFLAGS): error("Missing linker flags from QtWebEngineCore linking pri") isEmpty(NINJA_ARCHIVES): error("Missing archive files from QtWebEngineCore linking pri") isEmpty(NINJA_LIBS): error("Missing library files from QtWebEngineCore linking pri") - linux: LIBS_PRIVATE = $$NINJA_OBJECTS -Wl,-whole-archive $$NINJA_ARCHIVES -Wl,-no-whole-archive + OBJECTS = $$eval($$list($$NINJA_OBJECTS)) + linux { + LIBS_PRIVATE = -Wl,--start-group $$NINJA_ARCHIVES -Wl,--end-group + } else { + LIBS_PRIVATE = $$NINJA_ARCHIVES + } LIBS_PRIVATE += $$NINJA_LIB_DIRS $$NINJA_LIBS QMAKE_LFLAGS += $$NINJA_LFLAGS POST_TARGETDEPS += $$NINJA_TARGETDEPS |