From 8979f668d2c460ddfbd4b071491189fb77b87e6a Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Sat, 12 Jul 2008 10:04:44 -0700 Subject: 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. --- src/glut/beos/Makefile | 5 +++-- 1 file 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 -- cgit v1.2.1