diff options
| author | Brian Paul <[email protected]> | 2005-07-25 22:59:58 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2005-07-25 22:59:58 +0000 |
| commit | 8dcc6736aba672916bd4bc70a964c30bb11eeafa (patch) | |
| tree | 799d6ea38b64d65bd41e8b5e025678eb1e822b01 /src/mesa | |
| parent | e9dbe58b8b541d0abb9be9e1000a63776abe678c (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/mesa')
| -rw-r--r-- | src/mesa/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile index 6e13f5289c5..7a17bf5a618 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -96,7 +96,7 @@ LIBGL_CORE_OBJECTS = \ # Make libGL from core object files libgl-core: $(LIBGL_CORE_OBJECTS) - @ CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(GL_LIB) \ + @ $(TOP)/bin/mklib -o $(GL_LIB) -linker $(CC) \ -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \ -install $(LIB_DIR) $(MKLIB_OPTIONS) $(LIBGL_CORE_OBJECTS) $(GL_LIB_DEPS) @@ -150,7 +150,7 @@ subdirs: # Make the GL library $(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS) - @ CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(GL_LIB) \ + @ $(TOP)/bin/mklib -o $(GL_LIB) -linker $(CC) \ -major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \ -install $(LIB_DIR) \ $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(STAND_ALONE_OBJECTS) @@ -158,13 +158,13 @@ $(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS) # Make the OSMesa library $(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS) @ if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \ - CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(OSMESA_LIB) \ + $(TOP)/bin/mklib -o $(OSMESA_LIB) -linker $(CC) \ -major $(MESA_MAJOR) \ -minor $(MESA_MINOR) -patch $(MESA_TINY) \ -install $(LIB_DIR) $(MKLIB_OPTIONS) \ $(OSMESA_LIB_DEPS) $(OSMESA16_OBJECTS) ; \ else \ - CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(OSMESA_LIB) \ + $(TOP)/bin/mklib -o $(OSMESA_LIB) -linker $(CC) \ -major $(MESA_MAJOR) \ -minor $(MESA_MINOR) -patch $(GL_TINY) \ -install $(LIB_DIR) $(MKLIB_OPTIONS) \ |