summaryrefslogtreecommitdiff
path: root/src/egl
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/egl
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/egl')
-rw-r--r--src/egl/drivers/demo/Makefile5
-rw-r--r--src/egl/drivers/dri/Makefile3
-rw-r--r--src/egl/main/Makefile3
3 files changed, 7 insertions, 4 deletions
diff --git a/src/egl/drivers/demo/Makefile b/src/egl/drivers/demo/Makefile
index 2afb116ea7..6ca25aa5d6 100644
--- 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 28d33f698b..af0c40fe2b 100644
--- 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 40732fe8ad..7ab78197c7 100644
--- 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)