diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-06-18 09:54:20 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-06-21 11:30:07 +0100 |
| commit | 277d83e3e02205f63e922cbd41572111c41ac5b6 (patch) | |
| tree | c381f642f95b189cadad5bf72b1cd4adba6c69be | |
| parent | 73ff93a46a122e76ae400eed155f0b1ce13d9ed6 (diff) | |
gstdoc-scangobj: fix build with C compilers that don't support -Wall
Don't unconditionally pass -Wall to the compiler. Use WARNING_CFLAGS instead
if it is defined. Fixes build with Sun Studio Compiler.
Fixes #621963.
| -rwxr-xr-x | gstdoc-scangobj | 2 | ||||
| -rw-r--r-- | gtk-doc-plugins.mak | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gstdoc-scangobj b/gstdoc-scangobj index ca2aa59..f1d031b 100755 --- a/gstdoc-scangobj +++ b/gstdoc-scangobj @@ -1734,7 +1734,7 @@ close OUTPUT; $CC = $ENV{CC} ? $ENV{CC} : "gcc"; $LD = $ENV{LD} ? $ENV{LD} : $CC; -$CFLAGS = $ENV{CFLAGS} ? "$ENV{CFLAGS} -Wall -g" : "-Wall -g"; +$CFLAGS = $ENV{CFLAGS} ? "$ENV{CFLAGS}" : ""; $LDFLAGS = $ENV{LDFLAGS} ? $ENV{LDFLAGS} : ""; my $o_file; diff --git a/gtk-doc-plugins.mak b/gtk-doc-plugins.mak index 9d57449..9a64ca2 100644 --- a/gtk-doc-plugins.mak +++ b/gtk-doc-plugins.mak @@ -131,7 +131,7 @@ scanobj-build.stamp: $(SCANOBJ_DEPS) $(basefiles) inspect else \ $(INSPECT_ENVIRONMENT) \ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" \ - CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" \ + CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS) $(WARNING_CFLAGS)" \ LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ $(GST_DOC_SCANOBJ) --type-init-func="gst_init(NULL,NULL)" \ --module=$(DOC_MODULE) --source=$(PACKAGE) --inspect-dir="inspect" && \ |