summaryrefslogtreecommitdiff
path: root/src/glut
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2004-06-25 22:51:39 +0000
committerIan Romanick <idr@us.ibm.com>2004-06-25 22:51:39 +0000
commit9eecb03226a534e0fe59973133371b72e7c0d63d (patch)
treee1cff8862d5631117638abcc8f40750e2367c740 /src/glut
parent74b380b2ec16b387628b4e01f25eca7baf634048 (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/glut')
-rw-r--r--src/glut/glx/Makefile2
-rw-r--r--src/glut/mini/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/glut/glx/Makefile b/src/glut/glx/Makefile
index 2d76fd52eb..e725048df2 100644
--- 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 ebb28d18c2..d2cb5c744d 100644
--- 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)