diff options
| author | Ian Romanick <[email protected]> | 2004-06-25 22:51:39 +0000 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2004-06-25 22:51:39 +0000 |
| commit | 9eecb03226a534e0fe59973133371b72e7c0d63d (patch) | |
| tree | e1cff8862d5631117638abcc8f40750e2367c740 /src/mesa | |
| parent | 74b380b2ec16b387628b4e01f25eca7baf634048 (diff) | |
Make sure mklib sees the definition of CC and CXX. Make mklib respect
the definitions of CC and CXX on Linux. This fixed build issues with
sunos5-gcc and build issues on GCC 2.x Linux when CC and CXX are set
to a GCC 3.x compiler.
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/Makefile | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/fb/Makefile | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/x11/Makefile | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile index ea844afae7a..95ca042e748 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -105,19 +105,19 @@ subdirs: # Make the GL library $(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS) - $(TOP)/bin/mklib -o $(GL_LIB) -major $(GL_MAJOR) \ + CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GL_LIB) -major $(GL_MAJOR) \ -minor $(GL_MINOR) -patch $(GL_TINY) -install $(LIB_DIR) \ $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(STAND_ALONE_OBJECTS) # Make the OSMesa library $(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS) if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \ - $(TOP)/bin/mklib -o $(OSMESA_LIB) -major $(MESA_MAJOR) \ + CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(OSMESA_LIB) -major $(MESA_MAJOR) \ -minor $(MESA_MINOR) -patch $(MESA_TINY) \ -install $(LIB_DIR) $(MKLIB_OPTIONS) \ $(OSMESA_LIB_DEPS) $(OSMESA16_OBJECTS) ; \ else \ - $(TOP)/bin/mklib -o $(OSMESA_LIB) -major $(MESA_MAJOR) \ + CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(OSMESA_LIB) -major $(MESA_MAJOR) \ -minor $(MESA_MINOR) -patch $(GL_TINY) \ -install $(LIB_DIR) $(MKLIB_OPTIONS) \ $(OSMESA_LIB_DEPS) $(OSMESA_DRIVER_OBJECTS) ; \ diff --git a/src/mesa/drivers/dri/fb/Makefile b/src/mesa/drivers/dri/fb/Makefile index 578eeb94400..d5fedac481f 100644 --- a/src/mesa/drivers/dri/fb/Makefile +++ b/src/mesa/drivers/dri/fb/Makefile @@ -57,7 +57,7 @@ default: depend $(LIB_DIR)/$(LIBNAME) $(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile - $(TOP)/bin/mklib -o $(LIBNAME) -noprefix -install $(LIB_DIR) \ + CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(LIBNAME) -noprefix -install $(LIB_DIR) \ $(WINLIB) $(LIB_DEPS) $(WINOBJ) $(MESA_MODULES) $(OBJECTS) diff --git a/src/mesa/drivers/dri/x11/Makefile b/src/mesa/drivers/dri/x11/Makefile index a0334b17a3c..4fe42a2fbff 100644 --- a/src/mesa/drivers/dri/x11/Makefile +++ b/src/mesa/drivers/dri/x11/Makefile @@ -67,7 +67,7 @@ default: depend $(LIB_DIR)/$(LIBNAME) $(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile - $(TOP)/bin/mklib -o $(LIBNAME) -noprefix -install $(LIB_DIR) \ + CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(LIBNAME) -noprefix -install $(LIB_DIR) \ $(OBJECTS) $(WINLIB) $(LIB_DEPS) $(WINOBJ) $(MESA_MODULES) |