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.

diff --git a/bin/mklib b/bin/mklib
index a6e9a089f775419d3bb48d2967b1cd5505a343d8..9c1e0cdc9608bffd011830adef68c81203163044 100755 (executable)
--- a/bin/mklib
+++ b/bin/mklib
@@ -122,9 +122,9 @@ case $ARCH in
            #OPTS="-shared -Wl,-soname,${LIBNAME}"  # soname???
            OPTS="-shared"
             if [ $CPLUSPLUS = 1 ] ; then
-                LINK="g++"
+                LINK=$CXX
             else
-                LINK="gcc"
+                LINK=$CC
             fi
             rm -f ${LIBNAME}
 
@@ -158,9 +158,9 @@ case $ARCH in
             echo "mklib: Making" $ARCH "shared library: " ${LIBNAME}.so.${VERSION}
 
             if [ $CPLUSPLUS = 1 ] ; then
-                LINK="g++"
+                LINK=$CXX
             else
-                LINK="gcc"
+                LINK=$CC
             fi
 
             # rm any old libs

diff --git a/src/glu/sgi/Makefile b/src/glu/sgi/Makefile
index 940c14901aa5d12f4cbe3da9a81d87d699ba6256..f1d0d70ebf83a7495dea0da79e6460d310e3740c 100644 (file)
--- a/src/glu/sgi/Makefile
+++ b/src/glu/sgi/Makefile
@@ -128,7 +128,7 @@ default: $(LIB_DIR)/$(GLU_LIB_NAME)
 
 # Make the library:
 $(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS)
-       $(TOP)/bin/mklib -o $(GLU_LIB) -major $(GLU_MAJOR) \
+       CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GLU_LIB) -major $(GLU_MAJOR) \
                -minor $(GLU_MINOR) -patch $(GLU_TINY) \
                -cplusplus $(MKLIB_OPTIONS) -install $(LIB_DIR) \
                $(GLU_LIB_DEPS) $(OBJECTS)

diff --git a/src/glut/glx/Makefile b/src/glut/glx/Makefile
index 2d76fd52eb76fa36faab0ab3c2e7b9b062ec824a..e725048df2b60e8fdca9323322ea04aaff1aaf7d 100644 (file)
--- a/src/glut/glx/Makefile
+++ b/src/glut/glx/Makefile
@@ -91,7 +91,7 @@ default: $(LIB_DIR)/$(GLUT_LIB_NAME)
 
 # Make the library
 $(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS)
-       $(TOP)/bin/mklib -o $(GLUT_LIB) \
+       CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GLUT_LIB) \
                -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) \
                -patch $(GLUT_TINY) $(MKLIB_OPTIONS) -install $(LIB_DIR) \
                $(GLUT_LIB_DEPS) $(OBJECTS)

diff --git a/src/glut/mini/Makefile b/src/glut/mini/Makefile
index ebb28d18c23be40de49e0ece96bb78542de4a94a..d2cb5c744dbd327fa023c420facd660e531ece78 100644 (file)
--- a/src/glut/mini/Makefile
+++ b/src/glut/mini/Makefile
@@ -55,7 +55,7 @@ default: depend $(LIB_DIR)/$(GLUT_LIB_NAME)
 
 # Make the library
 $(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS)
-       $(TOP)/bin/mklib -o $(GLUT_LIB) \
+       CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GLUT_LIB) \
                -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) \
                -patch $(GLUT_TINY) $(GLUT_LIB_DEPS) -install $(LIB_DIR) \
                $(MKLIB_OPTIONS) $(OBJECTS)

diff --git a/src/glw/Makefile b/src/glw/Makefile
index 3af07a1491c49fa7bcf8f72dc2171281d8f6ac5b..393f8c3bcfb942e88fd3f3ac9da1c40472790eac 100644 (file)
--- a/src/glw/Makefile
+++ b/src/glw/Makefile
@@ -33,7 +33,7 @@ clean:
 
 # Make the library
 $(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS)
-       $(TOP)/bin/mklib -o $(GLW_LIB) -major $(MAJOR) -minor $(MINOR) \
+       CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GLW_LIB) -major $(MAJOR) -minor $(MINOR) \
                -patch $(TINY) $(MKLIB_OPTIONS) -install $(LIB_DIR) \
                $(GLW_LIB_DEPS) $(OBJECTS)
 

diff --git a/src/glx/mini/Makefile b/src/glx/mini/Makefile
index c030641feb66b2809a18a7f69e1758251449c43c..45bf6dd158444bef10c51011bdb6d13efbee2985 100644 (file)
--- a/src/glx/mini/Makefile
+++ b/src/glx/mini/Makefile
@@ -45,7 +45,7 @@ default: depend $(LIB_DIR)/$(GL_LIB_NAME)
 
 # Make libGL
 $(LIB_DIR)/$(GL_LIB_NAME):  $(OBJECTS) Makefile
-       $(TOP)/bin/mklib -o $(GL_LIB) -major 1 -minor 2 $(MKLIB_OPTIONS) \
+       CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GL_LIB) -major 1 -minor 2 $(MKLIB_OPTIONS) \
                -install $(LIB_DIR) $(GL_LIB_DEPS) $(OBJECTS)
        rm -f $(LIB_DIR)/miniglx.conf
        install example.miniglx.conf $(LIB_DIR)/miniglx.conf

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index ea844afae7ab82f7b583f41bfea0509091e6b7f3..95ca042e748c9b72ec8b5c37256b17a8917e21a0 100644 (file)
--- 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 578eeb944001e075a12836dcd3a29cfb133c0584..d5fedac481fdd044055c0a9ae4a32f11c56f3e5f 100644 (file)
--- 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 a0334b17a3c0fdc2d7674277d31a47d08cf034cb..4fe42a2fbff6ec9962af2c6bb51ab425095e1312 100644 (file)
--- 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)