diff options
author | Brian Paul <brian.paul@tungstengraphics.com> | 2005-07-25 22:59:58 +0000 |
---|---|---|
committer | Brian Paul <brian.paul@tungstengraphics.com> | 2005-07-25 22:59:58 +0000 |
commit | 8dcc6736aba672916bd4bc70a964c30bb11eeafa (patch) | |
tree | 799d6ea38b64d65bd41e8b5e025678eb1e822b01 /src/glu/sgi/Makefile | |
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/glu/sgi/Makefile')
-rw-r--r-- | src/glu/sgi/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glu/sgi/Makefile b/src/glu/sgi/Makefile index 19f5e280b7..30372c9592 100644 --- a/src/glu/sgi/Makefile +++ b/src/glu/sgi/Makefile @@ -136,8 +136,8 @@ $(LIB_DIR): # Make the library: $(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS) - CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(GLU_LIB) -major $(GLU_MAJOR) \ - -minor $(GLU_MINOR) -patch $(GLU_TINY) \ + $(TOP)/bin/mklib -o $(GLU_LIB) -linker $(CXX) \ + -major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \ -cplusplus $(MKLIB_OPTIONS) -install $(LIB_DIR) \ $(GLU_LIB_DEPS) $(OBJECTS) |