Closed Bug 973393 Opened 6 years ago Closed 6 years ago

Move the LOCAL_INCLUDES in ipc to moz.build

Categories

(Firefox Build System :: General, defect)

defect
Not set

Tracking

(Not tracked)

RESOLVED FIXED
mozilla30

People

(Reporter: ehsan, Assigned: ehsan)

References

Details

Attachments

(1 file)

No description provided.
Assignee: nobody → ehsan
Attachment #8376886 - Flags: review?(mshal)
Attachment #8376886 - Flags: review?(mh+mozilla)
Attachment #8376886 - Flags: review?(gps)
Comment on attachment 8376886 [details] [diff] [review]
Move the LOCAL_INCLUDES in ipc to moz.build

Review of attachment 8376886 [details] [diff] [review]:
-----------------------------------------------------------------

::: ipc/chromium/Makefile.in
@@ +12,5 @@
>    $(NULL)
>  else # } else {
>  # message_pump_libevent.cc includes third_party/libevent/event.h,
>  # which we put in $(DIST), see export rule below
> +CXXFLAGS += -I$(DIST)

Just make the export rule do its stuff in $(CURDIR)/third_party/libevent/event.h and remove this (since -I$(CURDIR) is already in INCLUDES as -I.)
Attachment #8376886 - Flags: review?(mshal)
Attachment #8376886 - Flags: review?(mh+mozilla)
Attachment #8376886 - Flags: review?(gps)
Attachment #8376886 - Flags: review+
(In reply to Mike Hommey [:glandium] from comment #2)
> Comment on attachment 8376886 [details] [diff] [review]
> Move the LOCAL_INCLUDES in ipc to moz.build
> 
> Review of attachment 8376886 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> ::: ipc/chromium/Makefile.in
> @@ +12,5 @@
> >    $(NULL)
> >  else # } else {
> >  # message_pump_libevent.cc includes third_party/libevent/event.h,
> >  # which we put in $(DIST), see export rule below
> > +CXXFLAGS += -I$(DIST)
> 
> Just make the export rule do its stuff in
> $(CURDIR)/third_party/libevent/event.h and remove this (since -I$(CURDIR) is
> already in INCLUDES as -I.)

What do you mean?  Which export rule specifically and what stuff?
Flags: needinfo?(mh+mozilla)
(In reply to :Ehsan Akhgari (needinfo? me!) (slow responsiveness, emailapocalypse) from comment #3)
> (In reply to Mike Hommey [:glandium] from comment #2)
> > Comment on attachment 8376886 [details] [diff] [review]
> > Move the LOCAL_INCLUDES in ipc to moz.build
> > 
> > Review of attachment 8376886 [details] [diff] [review]:
> > -----------------------------------------------------------------
> > 
> > ::: ipc/chromium/Makefile.in
> > @@ +12,5 @@
> > >    $(NULL)
> > >  else # } else {
> > >  # message_pump_libevent.cc includes third_party/libevent/event.h,
> > >  # which we put in $(DIST), see export rule below
> > > +CXXFLAGS += -I$(DIST)
> > 
> > Just make the export rule do its stuff in
> > $(CURDIR)/third_party/libevent/event.h and remove this (since -I$(CURDIR) is
> > already in INCLUDES as -I.)
> 
> What do you mean?  Which export rule specifically and what stuff?

As said in the comment above that line:
    # message_pump_libevent.cc includes third_party/libevent/event.h,
    # which we put in $(DIST), see export rule below

The export rule below, in that same file. http://mxr.mozilla.org/mozilla-central/source/ipc/chromium/Makefile.in#72

Change the rule to put in $(CURDIR) instead of $(DIST) and you're good to remove that -I.
Flags: needinfo?(mh+mozilla)
https://hg.mozilla.org/mozilla-central/rev/9db77f0644bd
Status: NEW → RESOLVED
Closed: 6 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla30
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.