macOS GN integration

Change-Id: I89850d43c8f11ec54b3a47318ef0b3f083ae3dee
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 63 insertions, 49 deletions

diff --git a/src/core/core_module.pro b/src/core/core_module.pro
index fc1c32786..a7853e524 100644
--- a/src/core/core_module.pro
+++ b/src/core/core_module.pro
@@ -24,13 +24,25 @@ 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")
-    OBJECTS = $$NINJA_OBJECTS
-    linux: LIBS_PRIVATE = -Wl,-whole-archive $$NINJA_ARCHIVES -Wl,-no-whole-archive
+    NINJA_OBJECTS = $$eval($$list($$NINJA_OBJECTS))
+    # Do manual response file linking for macOS and Linux
+    unix {
+        RSP_FILE = $$OUT_PWD/$$getConfigDir()/$${TARGET}.rsp
+        for(object, NINJA_OBJECTS): RSP_CONTENT += $$object
+        write_file($$RSP_FILE, RSP_CONTENT)
+        macos:LIBS_PRIVATE += -Wl,-filelist,$$shell_quote($$RSP_FILE)
+        linux:LIBS_PRIVATE += @$$RSP_FILE
+    } else {
+        OBJECTS = $$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
 }
 
+
 LIBS_PRIVATE += -L$$api_library_path
 CONFIG *= no_smart_library_merge
 osx {
@@ -58,58 +70,60 @@ qtConfig(egl): CONFIG += egl
 
 linux:qtConfig(separate_debug_info): QMAKE_POST_LINK="cd $(DESTDIR) && $(STRIP) --strip-unneeded $(TARGET)"
 
-!use?(gn) {
-
+use?(gn) {
+    REPACK_DIR = $$OUT_PWD/$$getConfigDir()
+} else {
     REPACK_DIR = $$OUT_PWD/$$getConfigDir()/gen/repack
-    # Duplicated from resources/resources.gyp
-    LOCALE_LIST = am ar bg bn ca cs da de el en-GB en-US es-419 es et fa fi fil fr gu he hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv sw ta te th tr uk vi zh-CN zh-TW
-    for(LOC, LOCALE_LIST) {
-        locales.files += $$REPACK_DIR/qtwebengine_locales/$${LOC}.pak
-    }
-    resources.files = $$REPACK_DIR/qtwebengine_resources.pak \
-        $$REPACK_DIR/qtwebengine_resources_100p.pak \
-        $$REPACK_DIR/qtwebengine_resources_200p.pak \
-        $$REPACK_DIR/qtwebengine_devtools_resources.pak
-
-    icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat
-
-    !debug_and_release|!build_all|CONFIG(release, debug|release) {
-        qtConfig(framework) {
-            locales.version = Versions
-            locales.path = Resources/qtwebengine_locales
-            resources.version = Versions
-            resources.path = Resources
-            icu.version = Versions
-            icu.path = Resources
-            # No files, this prepares the bundle Helpers symlink, process.pro will create the directories
-            qtwebengineprocessplaceholder.version = Versions
-            qtwebengineprocessplaceholder.path = Helpers
-            QMAKE_BUNDLE_DATA += icu locales resources qtwebengineprocessplaceholder
-        } else {
-            locales.CONFIG += no_check_exist
-            locales.path = $$[QT_INSTALL_TRANSLATIONS]/qtwebengine_locales
-            resources.CONFIG += no_check_exist
-            resources.path = $$[QT_INSTALL_DATA]/resources
-            INSTALLS += locales resources
-
-            !use?(system_icu) {
-                icu.CONFIG += no_check_exist
-                icu.path = $$[QT_INSTALL_DATA]/resources
-                INSTALLS += icu
-            }
-        }
+}
 
-        !qtConfig(framework):!force_independent {
-            #
-            # Copy essential files to the qtbase build directory for non-prefix builds
-            #
+# Duplicated from resources/resources.gyp
+LOCALE_LIST = am ar bg bn ca cs da de el en-GB en-US es-419 es et fa fi fil fr gu he hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv sw ta te th tr uk vi zh-CN zh-TW
+for(LOC, LOCALE_LIST) {
+    locales.files += $$REPACK_DIR/qtwebengine_locales/$${LOC}.pak
+}
+resources.files = $$REPACK_DIR/qtwebengine_resources.pak \
+    $$REPACK_DIR/qtwebengine_resources_100p.pak \
+    $$REPACK_DIR/qtwebengine_resources_200p.pak \
+    $$REPACK_DIR/qtwebengine_devtools_resources.pak
+
+icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat
+
+!debug_and_release|!build_all|CONFIG(release, debug|release) {
+    qtConfig(framework) {
+        locales.version = Versions
+        locales.path = Resources/qtwebengine_locales
+        resources.version = Versions
+        resources.path = Resources
+        icu.version = Versions
+        icu.path = Resources
+        # No files, this prepares the bundle Helpers symlink, process.pro will create the directories
+        qtwebengineprocessplaceholder.version = Versions
+        qtwebengineprocessplaceholder.path = Helpers
+        QMAKE_BUNDLE_DATA += icu locales resources qtwebengineprocessplaceholder
+    } else {
+        locales.CONFIG += no_check_exist
+        locales.path = $$[QT_INSTALL_TRANSLATIONS]/qtwebengine_locales
+        resources.CONFIG += no_check_exist
+        resources.path = $$[QT_INSTALL_DATA]/resources
+        INSTALLS += locales resources
+
+        !use?(system_icu) {
+            icu.CONFIG += no_check_exist
+            icu.path = $$[QT_INSTALL_DATA]/resources
+            INSTALLS += icu
+        }
+    }
 
-            !use?(system_icu) {
-                COPIES += icu
-            }
+    !qtConfig(framework):!force_independent {
+        #
+        # Copy essential files to the qtbase build directory for non-prefix builds
+        #
 
-            COPIES += resources locales
+        !use?(system_icu) {
+            COPIES += icu
         }
+
+        COPIES += resources locales
     }
 }