Bug 122467 - Modify WTF and JavascriptCore makefiles for 64bit build
Summary: Modify WTF and JavascriptCore makefiles for 64bit build
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Platform (show other bugs)
Version: 528+ (Nightly build)
Hardware: PC Windows 7
: P2 Normal
Assignee: Nobody
URL:
Keywords: InRadar
Depends on:
Blocks:
 
Reported: 2013-10-07 14:17 PDT by Roger Fong
Modified: 2013-10-07 15:25 PDT (History)
2 users (show)

See Also:


Attachments
patch (7.25 KB, patch)
2013-10-07 15:03 PDT, Roger Fong
bfulgham: review+
bfulgham: commit-queue-
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Roger Fong 2013-10-07 14:17:40 PDT
<rdar://problem/15169174>
Comment 1 Roger Fong 2013-10-07 15:03:31 PDT
Created attachment 213618 [details]
patch

Apparently WTF.make line endings were all wrong too...
Comment 2 Brent Fulgham 2013-10-07 15:09:48 PDT
Comment on attachment 213618 [details]
patch

View in context: https://bugs.webkit.org/attachment.cgi?id=213618&action=review

r=me with one suggestion before you land.

> Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.make:36
> +    set Path=%PATH%;$(SRCROOT)\%ProgramFilesAAS%

It seems like this %PATH% will contain the 32-bit path from line 12/14 above. Should we use a separate value here? Or maybe hold onto the original PATH (pre-changing in 12/14) with a different name, like "set OrigPath=%PATH%", then here do "Set Path=%OrigPath%;$(SRCROOT)...etc."

> Source/WTF/WTF.vcxproj/WTF.make:26
> +    set Path=%PATH%;$(SRCROOT)\%ProgramFilesAAS%

Ditto regarding path from above. Might want to retain original path in a separate variable, then use it here so we don't get the 32-bit path before our 64-bit stuff.
Comment 3 Roger Fong 2013-10-07 15:13:32 PDT
(In reply to comment #2)
> (From update of attachment 213618 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=213618&action=review
> 
> r=me with one suggestion before you land.
> 
> > Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.make:36
> > +    set Path=%PATH%;$(SRCROOT)\%ProgramFilesAAS%
> 
> It seems like this %PATH% will contain the 32-bit path from line 12/14 above. Should we use a separate value here? Or maybe hold onto the original PATH (pre-changing in 12/14) with a different name, like "set OrigPath=%PATH%", then here do "Set Path=%OrigPath%;$(SRCROOT)...etc."
> 
> > Source/WTF/WTF.vcxproj/WTF.make:26
> > +    set Path=%PATH%;$(SRCROOT)\%ProgramFilesAAS%
> 
> Ditto regarding path from above. Might want to retain original path in a separate variable, then use it here so we don't get the 32-bit path before our 64-bit stuff.


O yup, you're right, will change. Although this brings up another question which is why we need the path at all. I suppose it was useful when JavaScriptCore used JavaScriptCoreGenerator.exe. 
Perhaps it's useful to have it there though just in case any executable steps get added to the build steps in the future.
Comment 4 Brent Fulgham 2013-10-07 15:25:22 PDT
(In reply to comment #3)
> > Ditto regarding path from above. Might want to retain original path in a separate variable, then use it here so we don't get the 32-bit path before our 64-bit stuff.
> 
> 
> O yup, you're right, will change. Although this brings up another question which is why we need the path at all. I suppose it was useful when JavaScriptCore used JavaScriptCoreGenerator.exe. 
> Perhaps it's useful to have it there though just in case any executable steps get added to the build steps in the future.

Yeah, I think this might be important if there are tools that get built that need to be used as part of the Makefile portion of the build. I don't think we have anything like that, but better safe than sorry. This way we are "future proof". :-)
Comment 5 Roger Fong 2013-10-07 15:25:49 PDT
Committed: http://trac.webkit.org/changeset/157060 with Brent's comments.