1054536 - Port *FLAG and related changes to config.mk

Status: RESOLVED FIXED

(MailNews Core :: Build Config, defect)

Description

[Ian Neal]

make[5]: Entering directory `/home/gizmo/central/c-c/obj-sm/mozilla/suite/shell/src'
mkdir -p '.deps/'
nsGNOMEShellService.cpp
/usr/bin/ccache clang++ -o nsGNOMEShellService.o -c -I../../../dist/stl_wrappers -I../../../dist/system_wrappers -include /home/gizmo/central/c-c/mozilla/config/gcc_hidden.h -DMOZ_GLUE_IN_PROGRAM -DOSTYPE=\"Linux3.15.8-200.fc20\" -DOSARCH=Linux -DNO_NSPR_10_SUPPORT  -I/home/gizmo/central/c-c/suite/shell/src -I. -I../../../dist/include -I../../../dist/include/nsprpub  -I/home/gizmo/central/c-c/obj-sm/mozilla/dist/include/nspr -I/home/gizmo/central/c-c/obj-sm/mozilla/dist/include/nss       -fPIC -Qunused-arguments  -Qunused-arguments -Wall -Wpointer-arith -Woverloaded-virtual -Werror=return-type -Werror=int-to-pointer-cast -Werror=type-limits -Wempty-body -Wsign-compare -Wno-invalid-offsetof -Wno-c++0x-extensions -Wno-extended-offsetof -Wno-unknown-warning-option -Wno-return-type-c-linkage -fno-exceptions -fno-strict-aliasing -fno-rtti -fno-exceptions -fno-math-errno -std=gnu++0x -I/home/gizmo/central/c-c/mozilla/build/unix/headers -pthread -pipe  -DNDEBUG -DTRIMMED -g -Os  -fomit-frame-pointer  -Qunused-arguments  -DMOZILLA_CLIENT -include ../../../mozilla-config.h -MD -MP -MF .deps/nsGNOMEShellService.o.pp   /home/gizmo/central/c-c/suite/shell/src/nsGNOMEShellService.cpp
In file included from /home/gizmo/central/c-c/suite/shell/src/nsGNOMEShellService.cpp:28:
../../../dist/system_wrappers/glib.h:3:15: fatal error: 'glib.h' file not found
#include_next <glib.h>
              ^
1 error generated.
make[5]: *** [nsGNOMEShellService.o] Error 1
make[5]: Leaving directory `/home/gizmo/central/c-c/obj-sm/mozilla/suite/shell/src'
make[4]: *** [suite/shell/src/target] Error 2
make[4]: Leaving directory `/home/gizmo/central/c-c/obj-sm/mozilla'
make[3]: *** [compile] Error 2
make[3]: Leaving directory `/home/gizmo/central/c-c/obj-sm/mozilla'
make[2]: *** [default] Error 2
make[2]: Leaving directory `/home/gizmo/central/c-c/obj-sm/mozilla'
make[1]: *** [default] Error 2
make[1]: Leaving directory `/home/gizmo/central/c-c/obj-sm'
make: *** [build] Error 2

Comment 1

[Ian Neal]

Attachment: Patch that causes the problem

This simple change causes the problem. I am reasonably sure that before the c-c / m-c objdir merge it worked. It has definitely worked in the last week.

Comment 2

[Joshua Cranmer [:jcranmer]]

Solution discussed over IRC: The changes to config.mk needed to be ported.

Comment 3

[Ian Neal]

Attachment: FLAGS changes [Checked in: Comment 5]

This ports the following changes from m-c:
Bug 625962 - unbitrot shark profiling
Bug 655003 - Sort out optimization defaults
Bug 676589 - xpcom/configure ios build fixes
Bug 761218 - Get rid of the bogus $(DIST)/include/nsprpub include path
Bug 778236 - Integrate gyp->makefile translation in ConfigStatus.py
Bug 804441 - Put our NSPR and NSS header wrappers before OS_INCLUDES to allow inline functions in headers to call NSPR/NSS functions
Bug 812218 - User-specified CFLAGS/CXXFLAGS should be applied at the end of the commandline, not in the middle
Bug 939580 - Create unified files based on the absolute path of the original source files
Bug 973649 - Add logic for CFLAGS, CXXFLAGS and LDFLAGS to moz.build
Bug 976896 - Port STL_FLAGS to moz.build

Comment 4

[Joshua Cranmer [:jcranmer]]

Comment on attachment 8474142 [details] [diff] [review]
FLAGS changes [Checked in: Comment 5]

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

::: config/config.mk
@@ +785,5 @@
> +
> +DISABLE_STL_WRAPPING := 1
> +# Skip most Mozilla-specific include locations.
> +INCLUDES = -I. $(LOCAL_INCLUDES) -I$(DEPTH)/dist/include
> +endif

I don't think this is necessary, but I'm gathering that you're trying to minimize the diff between {c,m}-c/config/config.mk.

Comment 5

[Ian Neal]

Comment on attachment 8474142 [details] [diff] [review]
FLAGS changes [Checked in: Comment 5]

http://hg.mozilla.org/comm-central/rev/bdc8535ce585