summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gallium/drivers/svga/Makefile2
-rw-r--r--src/gallium/drivers/svga/SConscript3
-rw-r--r--src/gallium/winsys/drm/vmware/core/SConscript2
3 files changed, 2 insertions, 5 deletions
diff --git a/src/gallium/drivers/svga/Makefile b/src/gallium/drivers/svga/Makefile
index 05ab4ab9b30..fe1d6d73841 100644
--- a/src/gallium/drivers/svga/Makefile
+++ b/src/gallium/drivers/svga/Makefile
@@ -57,7 +57,7 @@ CC = gcc -fvisibility=hidden -msse -msse2
# Set the gnu99 standard to enable anonymous structs in vmware headers.
#
-CFLAGS = -Wall -Werror -Wmissing-prototypes -std=gnu99 -ffast-math \
+CFLAGS = -Wall -Wmissing-prototypes -std=gnu99 -ffast-math \
$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)
include ../../Makefile.template
diff --git a/src/gallium/drivers/svga/SConscript b/src/gallium/drivers/svga/SConscript
index 0fa745c9b86..ff9645fc03a 100644
--- a/src/gallium/drivers/svga/SConscript
+++ b/src/gallium/drivers/svga/SConscript
@@ -10,9 +10,6 @@ if env['gcc']:
'HAVE_STDINT_H',
'HAVE_SYS_TYPES_H',
])
- if env['platform'] not in ['windows']:
- # The Windows headers cause many gcc warnings
- env.Append(CCFLAGS = ['-Werror'])
env.Prepend(CPPPATH = [
'include',
diff --git a/src/gallium/winsys/drm/vmware/core/SConscript b/src/gallium/winsys/drm/vmware/core/SConscript
index 1875b659ac6..edaf9458bee 100644
--- a/src/gallium/winsys/drm/vmware/core/SConscript
+++ b/src/gallium/winsys/drm/vmware/core/SConscript
@@ -3,7 +3,7 @@ Import('*')
env = env.Clone()
if env['gcc']:
- env.Append(CCFLAGS = ['-fvisibility=hidden', '-Werror'])
+ env.Append(CCFLAGS = ['-fvisibility=hidden'])
env.Append(CPPDEFINES = [
'HAVE_STDINT_H',
'HAVE_SYS_TYPES_H',