summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2008-01-31 17:22:07 -0800
committerIan Romanick <idr@us.ibm.com>2008-01-31 17:22:07 -0800
commit20df285b14bc655d5429c7d2b82446204f9a1f2e (patch)
treef4bac0f2a70c8b23b9e92aab9585702dbc6082ad /src/mesa
parent635341ec5b06b3db453e88f44663d2ad711c3f7d (diff)
Fix using "ccache ppu-gcc" for CC and fix parallel builds
CC wasn't quoted in a couple places in src/mesa/Makefile. Also, the OSMesa link was missing a dependency.
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/Makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index b16d74bf49..720f1b2e02 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -125,24 +125,25 @@ osmesa-only: depend subdirs $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)
# Make the GL library
$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS) $(PIPE_LIB) $(CELL_LIB) $(CELL_LIB_SPU) $(LLVM_LIB)
@ $(TOP)/bin/mklib -o $(GL_LIB) \
- -linker $(CC) \
+ -linker "$(CC)" \
-major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \
-install $(TOP)/$(LIB_DIR) \
$(MKLIB_OPTIONS) $(STAND_ALONE_OBJECTS) \
$(PIPE_LIB) $(CELL_LIB) $(CELL_LIB_SPU) $(LLVM_LIB) $(GL_LIB_DEPS)
# Make the OSMesa library
-$(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS)
+$(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) \
+ $(OSMESA16_OBJECTS) $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
@ if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \
$(TOP)/bin/mklib -o $(OSMESA_LIB) \
- -linker $(CC) \
+ -linker "$(CC)" \
-major $(MESA_MAJOR) \
-minor $(MESA_MINOR) -patch $(MESA_TINY) \
-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
$(OSMESA_LIB_DEPS) $(OSMESA16_OBJECTS) ; \
else \
$(TOP)/bin/mklib -o $(OSMESA_LIB) \
- -linker $(CC) \
+ -linker "$(CC)" \
-major $(MESA_MAJOR) \
-minor $(MESA_MINOR) -patch $(GL_TINY) \
-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \