Changeset 248075 in webkit

Timestamp:

Jul 31, 2019 2:36:59 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK][WPE] Fix gtkdoc build with "build-webkit --32-bit" on 64-bit hosts
​https://bugs.webkit.org/show_bug.cgi?id=200306

Patch by Loïc Yhuel <​loic.yhuel@softathome.com> on 2019-07-31
Reviewed by Michael Catanzaro.

gtkdoc-scangobj calls scangobj.py, which only uses LDFLAGS on link (when producing
jsc-glib-4.0-scan for example).

• Scripts/webkitdirs.pm:

(generateBuildSystemFromCMakeProject):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-07-31  Loïc Yhuel  <loic.yhuel@softathome.com>
+
+        [GTK][WPE] Fix gtkdoc build with "build-webkit --32-bit" on 64-bit hosts
+        https://bugs.webkit.org/show_bug.cgi?id=200306
+
+        Reviewed by Michael Catanzaro.
+
+        gtkdoc-scangobj calls scangobj.py, which only uses LDFLAGS on link (when producing
+        jsc-glib-4.0-scan for example).
+
+        * Scripts/webkitdirs.pm:
+        (generateBuildSystemFromCMakeProject):
+
 2019-07-31  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -2266 +2266 @@
         $ENV{"CFLAGS"} =  "-m32" . ($ENV{"CFLAGS"} || "");
         $ENV{"CXXFLAGS"} = "-m32" . ($ENV{"CXXFLAGS"} || "");
+        $ENV{"LDFLAGS"} = "-m32" . ($ENV{"LDFLAGS"} || "");
     }
     push @args, @cmakeArgs if @cmakeArgs;