1*4882a593SmuzhiyunUse LD and obey LDFLAGS 2*4882a593Smuzhiyun 3*4882a593SmuzhiyunSigned-off-by: Christopher Larson <chris_larson@mentor.com> 4*4882a593SmuzhiyunUpstream-Status: Pending 5*4882a593Smuzhiyun 6*4882a593Smuzhiyundiff --git a/make/linux/Makefile b/make/linux/Makefile 7*4882a593Smuzhiyunindex 391b6e3..a2ac13e 100644 8*4882a593Smuzhiyun--- a/make/linux/Makefile 9*4882a593Smuzhiyun+++ b/make/linux/Makefile 10*4882a593Smuzhiyun@@ -64,6 +64,7 @@ objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources)) 11*4882a593Smuzhiyun WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow 12*4882a593Smuzhiyun COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE) 13*4882a593Smuzhiyun DEPENDFLAGS = $(CXXFLAGS) $(INCLUDE) 14*4882a593Smuzhiyun+LINKFLAGS=$(LDFLAGS) 15*4882a593Smuzhiyun 16*4882a593Smuzhiyun ifeq (Darwin,$(shell uname -s)) 17*4882a593Smuzhiyun all: staticlib 18*4882a593Smuzhiyun@@ -91,7 +92,7 @@ $(LIBRARY): $(objects) 19*4882a593Smuzhiyun $(RANLIB) $@ 20*4882a593Smuzhiyun 21*4882a593Smuzhiyun $(LIBRARY_SO): $(objects_so) 22*4882a593Smuzhiyun- $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) 23*4882a593Smuzhiyun+ $(LD) $(LINKFLAGS) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) 24*4882a593Smuzhiyun rm -f $(LIBRARY_SO) 25*4882a593Smuzhiyun ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO) 26*4882a593Smuzhiyun 27*4882a593Smuzhiyundiff --git a/make/mingw32/Makefile b/make/mingw32/Makefile 28*4882a593Smuzhiyunindex e5986ef..6ca16aa 100644 29*4882a593Smuzhiyun--- a/make/mingw32/Makefile 30*4882a593Smuzhiyun+++ b/make/mingw32/Makefile 31*4882a593Smuzhiyun@@ -18,6 +18,7 @@ DEBUGFLAGS=-g -DDEBUG 32*4882a593Smuzhiyun endif 33*4882a593Smuzhiyun CROSS = 34*4882a593Smuzhiyun CXX = $(CROSS)g++ 35*4882a593Smuzhiyun+LD = $(CXX) 36*4882a593Smuzhiyun CC = $(CROSS)gcc 37*4882a593Smuzhiyun WINDRES = $(CROSS)windres 38*4882a593Smuzhiyun RANLIB = $(CROSS)ranlib 39*4882a593Smuzhiyun@@ -33,6 +34,7 @@ LIBS = libebml.a 40*4882a593Smuzhiyun endif 41*4882a593Smuzhiyun INCS = -I"$(shell pwd)/../.." 42*4882a593Smuzhiyun COMPILEFLAGS = $(DEBUGFLAGS) $(INCS) $(DLLFLAGS) $(CXXFLAGS) 43*4882a593Smuzhiyun+LINKFLAGS = $(LDFLAGS) 44*4882a593Smuzhiyun 45*4882a593Smuzhiyun .PHONY: all all-before all-after clean clean-custom 46*4882a593Smuzhiyun 47*4882a593Smuzhiyun@@ -54,7 +56,7 @@ libebml.a: $(OBJ) 48*4882a593Smuzhiyun $(RANLIB) $@ 49*4882a593Smuzhiyun 50*4882a593Smuzhiyun libebml.dll: $(OBJ) 51*4882a593Smuzhiyun- $(CXX) -shared -Wl,--export-all -Wl,--out-implib=$@.a -o $@ $(OBJ) 52*4882a593Smuzhiyun+ $(LD) $(LINKFLAGS) -shared -Wl,--export-all -Wl,--out-implib=$@.a -o $@ $(OBJ) 53*4882a593Smuzhiyun 54*4882a593Smuzhiyun depend: 55*4882a593Smuzhiyun @echo Calculating dependecies: 56*4882a593Smuzhiyun-- 57*4882a593Smuzhiyun2.8.0 58