diff options
| author | Ian Romanick <idr@us.ibm.com> | 2004-06-25 22:51:39 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2011-07-11 20:03:32 +0100 |
| commit | bdbc4adc7aa493c7f74fbcb6da9d4ecb122233fd (patch) | |
| tree | cf52dc6513180899b108e312cec6f017a06d7674 | |
| parent | 905197797e5e8e0b90e911879204e9f409231928 (diff) | |
| download | glut-bdbc4adc7aa493c7f74fbcb6da9d4ecb122233fd.tar.gz | |
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.
| -rw-r--r-- | src/glut/glx/Makefile | 2 | ||||
| -rw-r--r-- | src/glut/mini/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/glut/glx/Makefile b/src/glut/glx/Makefile index 2d76fd5..e725048 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 ebb28d1..d2cb5c7 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) |