diff options
| author | Tobias Droste <[email protected]> | 2011-03-16 18:45:29 +0100 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2011-03-16 13:54:50 -0700 |
| commit | f3a828c21fcb95c67868f0224ab4ec92f54eee7f (patch) | |
| tree | 84e6f8e7b5a66855564283c0dead25e1bac8950c | |
| parent | 2baac48f3900b6e7a6443c6c116899cf95275629 (diff) | |
autoconf: don't use CFLAGS for cpp files
Signed-off-by: Tobias Droste <[email protected]>
| -rw-r--r-- | src/glsl/Makefile | 2 | ||||
| -rw-r--r-- | src/mesa/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/glsl/Makefile b/src/glsl/Makefile index cd7c41a2abc..e4b992dbc11 100644 --- a/src/glsl/Makefile +++ b/src/glsl/Makefile @@ -204,7 +204,7 @@ glcpp/glcpp-parse.c: glcpp/glcpp-parse.y bison -v -o "$@" --defines=glcpp/glcpp-parse.h $< builtin_compiler: $(GLSL2_OBJECTS) $(OBJECTS) builtin_stubs.o - $(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(GLSL2_OBJECTS) builtin_stubs.o -o $@ + $(APP_CXX) $(INCLUDES) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(GLSL2_OBJECTS) builtin_stubs.o -o $@ builtin_function.cpp: builtins/profiles/* builtins/ir/* builtins/tools/generate_builtins.py builtins/tools/texture_builtins.py builtin_compiler @echo Regenerating builtin_function.cpp... diff --git a/src/mesa/Makefile b/src/mesa/Makefile index 10d73f000e3..03962e9c194 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -43,7 +43,7 @@ endef define mesa-cxx-c @mkdir -p $(dir $@) - $(CXX) -c -o $@ $< $($(1)_CPPFLAGS) $($(1)_CFLAGS) $($(1)_CXXFLAGS) + $(CXX) -c -o $@ $< $($(1)_CPPFLAGS) $($(1)_CXXFLAGS) endef $(MESA_OBJ_DIR)/%.o: %.c |