summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Nicholson <dbn.lists@gmail.com>2008-07-12 10:04:44 -0700
committerJosé Fonseca <jfonseca@vmware.com>2011-07-11 20:04:43 +0100
commit8979f668d2c460ddfbd4b071491189fb77b87e6a (patch)
tree7eff73473de80dfcdcf3005c1bdbf01cec303a02
parent4ec3ca1acdaded2fdb5c9a7f55cd93aa6d3542fb (diff)
downloadglut-8979f668d2c460ddfbd4b071491189fb77b87e6a.tar.gz
Always pass -linker and -ldflags to mklib for shared libraries
This just makes the use of mklib more consistent throughout Mesa where we always want to pass the linker and LDFLAGS when we might be making a shared library.
-rw-r--r--src/glut/beos/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/glut/beos/Makefile b/src/glut/beos/Makefile
index e17c501..a9f8684 100644
--- a/src/glut/beos/Makefile
+++ b/src/glut/beos/Makefile
@@ -83,9 +83,10 @@ $(TOP)/$(LIB_DIR):
# Make the library
$(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS)
- @$(MKLIB) -o $(GLUT_LIB) -ldflags '$(LDFLAGS)' $(MKLIB_OPTIONS) \
+ @$(MKLIB) -o $(GLUT_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-major $(GLUT_MAJOR) -minor $(GLUT_MINOR) -patch $(GLUT_TINY) \
- -install $(TOP)/$(LIB_DIR) $(GLUT_LIB_DEPS) $(OBJECTS)
+ -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
+ $(GLUT_LIB_DEPS) $(OBJECTS)
clean:
-rm -f *.o