summaryrefslogtreecommitdiff
path: root/src/glx/x11
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2005-07-25 22:59:58 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2005-07-25 22:59:58 +0000
commit8dcc6736aba672916bd4bc70a964c30bb11eeafa (patch)
tree799d6ea38b64d65bd41e8b5e025678eb1e822b01 /src/glx/x11
parente9dbe58b8b541d0abb9be9e1000a63776abe678c (diff)
Added -linker option to mklib, used to specify a particular program for
linking, if relevant. Updated Makefiles to use -linker option instead of setting CC, CXX env vars.
Diffstat (limited to 'src/glx/x11')
-rw-r--r--src/glx/x11/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile
index bca2ee4ffa..3ffa4780d4 100644
--- a/src/glx/x11/Makefile
+++ b/src/glx/x11/Makefile
@@ -88,7 +88,8 @@ dispatch.c:
# Make libGL
$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) Makefile
- CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(GL_LIB) -major 1 -minor 2 $(MKLIB_OPTIONS) \
+ $(TOP)/bin/mklib -o $(GL_LIB) -linker $(CC) \
+ -major 1 -minor 2 $(MKLIB_OPTIONS) \
-install $(LIB_DIR) $(GL_LIB_DEPS) $(OBJECTS)