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/glx | |
| 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/glx')
| -rw-r--r-- | src/glx/mini/Makefile | 3 | ||||
| -rw-r--r-- | src/glx/x11/Makefile | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/glx/mini/Makefile b/src/glx/mini/Makefile index 612610526e8..a9bced2508c 100644 --- a/src/glx/mini/Makefile +++ b/src/glx/mini/Makefile @@ -55,7 +55,8 @@ default: depend $(LIB_DIR)/$(GL_LIB_NAME) # 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) rm -f $(LIB_DIR)/miniglx.conf install example.miniglx.conf $(LIB_DIR)/miniglx.conf diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile index bca2ee4ffa9..3ffa4780d46 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) |