summaryrefslogtreecommitdiff
path: root/src/glut
diff options
context:
space:
mode:
authorDan Nicholson <dbn.lists@gmail.com>2008-07-12 10:04:44 -0700
committerDan Nicholson <dbn.lists@gmail.com>2008-07-12 10:25:40 -0700
commit3b8081603bf846285e56a6ecafaf182935fd8733 (patch)
tree150f5908cdcc678808da1e110ec68206b68cafe9 /src/glut
parentdb072baaaf6adcd176ea7e4d67b77177de7eca31 (diff)
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.
Diffstat (limited to 'src/glut')
-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 c67ace50c5..14f4f43f84 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