diff options
| author | Ian Romanick <idr@us.ibm.com> | 2008-01-03 15:11:02 -0800 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2008-01-23 15:25:52 -0800 |
| commit | dc1abc393206c3eb00e7cca60ce3499c993bc1f6 (patch) | |
| tree | 5f894ef5ab27c566738d30db538a88e4fdd22c81 /src | |
| parent | b3492a2052a8877739ddf430922ed48ae30d84da (diff) | |
| download | external_mesa3d-dc1abc393206c3eb00e7cca60ce3499c993bc1f6.zip external_mesa3d-dc1abc393206c3eb00e7cca60ce3499c993bc1f6.tar.gz external_mesa3d-dc1abc393206c3eb00e7cca60ce3499c993bc1f6.tar.bz2 | |
Specify linker instead of letting mklib use gcc
This is the final bit required to get Cell builds on x86 working.
Without this, mklib tries to link using the x86 gcc instead of
ppu32-gcc.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile index 681c566..b16d74b 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -125,6 +125,7 @@ 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) \ -major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \ -install $(TOP)/$(LIB_DIR) \ $(MKLIB_OPTIONS) $(STAND_ALONE_OBJECTS) \ @@ -134,12 +135,14 @@ $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS) $(PIPE_LIB) $(CELL_LIB) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS) @ if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \ $(TOP)/bin/mklib -o $(OSMESA_LIB) \ + -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) \ -major $(MESA_MAJOR) \ -minor $(MESA_MINOR) -patch $(GL_TINY) \ -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \ |