summaryrefslogtreecommitdiff
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
commit06e6759236acc22e5c455a03b1ce9edfd3f0c898 (patch)
tree8a3808ae72e71d3511ac1540cd2bbd11c41d7621
parent3e80e52a7069f7c5184133ca299eb8e0b6cb9670 (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.
-rw-r--r--Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 4f1abf5..12719f7 100644
--- a/Makefile
+++ b/Makefile
@@ -33,8 +33,9 @@ clean:
# Make the library
$(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS)
- CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(GLW_LIB) -major $(MAJOR) -minor $(MINOR) \
- -patch $(TINY) $(MKLIB_OPTIONS) -install $(LIB_DIR) \
+ $(TOP)/bin/mklib -o $(GLW_LIB) -linker $(CC) \
+ -major $(MAJOR) -minor $(MINOR) -patch $(TINY) \
+ $(MKLIB_OPTIONS) -install $(LIB_DIR) \
$(GLW_LIB_DEPS) $(OBJECTS)