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.

diff --git a/progs/tools/trace/Makefile b/progs/tools/trace/Makefile
index b5dd90a6d04e28dbf640fbc16a761503a2047f38..822e466ad1b517afa9b20e38fea6cc65d50f7583 100644 (file)
--- a/progs/tools/trace/Makefile
+++ b/progs/tools/trace/Makefile
@@ -16,8 +16,8 @@ TRACER = gltrace.so
 default: $(TRACER)
 
 $(TRACER): $(OBJECTS)
-       $(MKLIB) -o $(TRACER) -noprefix -cplusplus -ldflags '$(LDFLAGS)' \
-               $(MKLIB_OPTIONS) $(OBJECTS)
+       $(MKLIB) -o $(TRACER) -noprefix -cplusplus -linker '$(CXX)' \
+               -ldflags '$(LDFLAGS)' $(MKLIB_OPTIONS) $(OBJECTS)
 
 gltrace.cc: gltrace.py
        PYTHONPATH=$(TOP)/src/mesa/glapi python gltrace.py -f $(TOP)/src/mesa/glapi/gl_API.xml  > gltrace.cc

diff --git a/src/egl/drivers/demo/Makefile b/src/egl/drivers/demo/Makefile
index 2afb116ea7d27735a297db1c477d70e88e36909d..6ca25aa5d656a60abfe9efc447cfc35dc4b632fa 100644 (file)
--- a/src/egl/drivers/demo/Makefile
+++ b/src/egl/drivers/demo/Makefile
@@ -21,8 +21,9 @@ default: $(TOP)/$(LIB_DIR)/demodriver.so
 
 
 $(TOP)/$(LIB_DIR)/demodriver.so: $(OBJECTS)
-       $(MKLIB) -o demodriver.so -noprefix -ldflags '$(LDFLAGS)' \
-               -install $(TOP)/$(LIB_DIR) $(OBJECTS)
+       $(MKLIB) -o demodriver.so -noprefix -linker '$(CC)' \
+               -ldflags '$(LDFLAGS)' -install $(TOP)/$(LIB_DIR) \
+               $(OBJECTS)
 
 
 

diff --git a/src/egl/drivers/dri/Makefile b/src/egl/drivers/dri/Makefile
index 28d33f698b369aa21d775f5de99fd397a7469160..af0c40fe2b769be190ca3f881cd5c70a5cb6cffb 100644 (file)
--- a/src/egl/drivers/dri/Makefile
+++ b/src/egl/drivers/dri/Makefile
@@ -42,7 +42,8 @@ default: depend library Makefile
 library: $(TOP)/$(LIB_DIR)/libEGLdri.so
 
 $(TOP)/$(LIB_DIR)/libEGLdri.so: $(OBJECTS)
-       $(MKLIB) -o EGLdri -ldflags '$(LDFLAGS)' -major 1 -minor 0 \
+       $(MKLIB) -o EGLdri -linker '$(CC)' -ldflags '$(LDFLAGS)' \
+               -major 1 -minor 0 \
                -install $(TOP)/$(LIB_DIR) -ldl $(OBJECTS)
 
 

diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile
index 40732fe8ad6533118ced432199f3b7b411da7c99..7ab78197c7bc963e5bd3ebbe9729aa106e6f13ba 100644 (file)
--- a/src/egl/main/Makefile
+++ b/src/egl/main/Makefile
@@ -46,7 +46,8 @@ default: depend library
 library: $(TOP)/$(LIB_DIR)/libEGL.so
 
 $(TOP)/$(LIB_DIR)/libEGL.so: $(OBJECTS)
-       $(MKLIB) -o EGL -ldflags '$(LDFLAGS)' -major 1 -minor 0 \
+       $(MKLIB) -o EGL -linker '$(CC)' -ldflags '$(LDFLAGS)' \
+               -major 1 -minor 0 \
                -install $(TOP)/$(LIB_DIR) -ldl $(OBJECTS)
 
 

diff --git a/src/glut/beos/Makefile b/src/glut/beos/Makefile
index c67ace50c5dc6786be784e363751f510aea74de1..14f4f43f84ade486b91e1a03f849458e2e2568ef 100644 (file)
--- 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

diff --git a/src/mesa/drivers/beos/Makefile b/src/mesa/drivers/beos/Makefile
index f26264de8b63609dc5f5554e099ebde71a559bc6..c79dd24c390a17f9b1b8702946eaaad8bcaa5bb0 100644 (file)
--- a/src/mesa/drivers/beos/Makefile
+++ b/src/mesa/drivers/beos/Makefile
@@ -181,9 +181,10 @@ $(TOP)/$(LIB_DIR):
        mkdir $(TOP)/$(LIB_DIR)
 
 $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(MESA_MODULES) $(GLU_MODULES)
-       @$(MKLIB) -o $(GL_LIB) -ldflags '$(LDFLAGS)' -install $(TOP)/$(LIB_DIR) \
+       @$(MKLIB) -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
                -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
-               $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(OBJECTS) $(MESA_MODULES) $(GLU_MODULES)
+               -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) $(GL_LIB_DEPS) \
+               $(OBJECTS) $(MESA_MODULES) $(GLU_MODULES)
 
 # $(GLU_OBJECTS):
 #      cd $(GLU_DIR) && $(MAKE) $< ;

diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template
index 4d1b057fb0c45de41043d1ae94b47d8cbf5a50bf..95eeecc7c4f64368c08b6798f55ab0554a78f12f 100644 (file)
--- a/src/mesa/drivers/dri/Makefile.template
+++ b/src/mesa/drivers/dri/Makefile.template
@@ -68,7 +68,7 @@ default: symlinks depend $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME)
 
 
 $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
-       $(MKLIB) -ldflags '$(LDFLAGS)' -noprefix -o $@ \
+       $(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
                $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)
 
 

diff --git a/src/mesa/drivers/osmesa/Makefile b/src/mesa/drivers/osmesa/Makefile
index 97f2b25a14945c8e446b9758b9311362d81d34b7..8b2feee6b0ea54e4ce512d7edd7dc3d5495ab764 100644 (file)
--- a/src/mesa/drivers/osmesa/Makefile
+++ b/src/mesa/drivers/osmesa/Makefile
@@ -45,10 +45,9 @@ default:
 osmesa8: $(TOP)/lib/$(OSMESA_LIB_NAME)
 
 $(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS)
-       $(MKLIB) -o $(OSMESA_LIB) -linker "$(CC)" \
+       $(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
                -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
-               -install $(TOP)/$(LIB_DIR) \
-               $(MKLIB_OPTIONS) \
+               -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
                $(OSMESA_LIB_DEPS) $(OBJECTS)
 
 
@@ -57,10 +56,9 @@ $(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS)
 # The libOSMesa16/libOSMesa32 libraries do not use libGL but rather are built
 # with all the other Mesa sources (compiled with -DCHAN_BITS=16/32
 osmesa16: $(OBJECTS) $(CORE_MESA)
-       $(MKLIB) -o $(OSMESA_LIB) -linker "$(CC)" \
+       $(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
                -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
-               -install $(TOP)/$(LIB_DIR) \
-               $(MKLIB_OPTIONS) \
+               -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
                $(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA)
 
 

diff --git a/src/mesa/drivers/x11/Makefile b/src/mesa/drivers/x11/Makefile
index 4c2493d7e29056f7352a180befb46f705e6046fb..b025246e6343724e8ca8df3b6809fa8cff0e4318 100644 (file)
--- a/src/mesa/drivers/x11/Makefile
+++ b/src/mesa/drivers/x11/Makefile
@@ -57,8 +57,8 @@ default: $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
 $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(CORE_MESA)
        @ $(MKLIB) -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
                -major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \
-               -install $(TOP)/$(LIB_DIR) \
-               $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(OBJECTS) $(CORE_MESA)
+               -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
+               $(GL_LIB_DEPS) $(OBJECTS) $(CORE_MESA)