From 3985754378ae9922a874d880f478dcff360a6224 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Sat, 10 Dec 2005 22:33:25 -0500 Subject: [PATCH] Use $(LDFLAGS) when generating shared libraries Makefile.elf-lib, Makefile.solaris-lib: Add $(LDFLAGS) to the command line argument when generating the shared library, to allow cross-compile and other builds that might need to specify -L paths to needed libraries. Addresses Sourceforge Bug #1261549 Signed-off-by: "Theodore Ts'o" --- lib/ChangeLog | 8 ++++++++ lib/Makefile.elf-lib | 2 +- lib/Makefile.solaris-lib | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index 6178633..3e62728 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,11 @@ +2005-12-10 Theodore Ts'o + + * Makefile.elf-lib, Makefile.solaris-lib: Add $(LDFLAGS) to the + command line argument when generating the shared library, + to allow cross-compile and other builds that might need to + specify -L paths to needed libraries. (Addresses + Sourceforge Bug #1261549) + 2006-06-30 Theodore Ts'o * Release of E2fsprogs 1.38 diff --git a/lib/Makefile.elf-lib b/lib/Makefile.elf-lib index b07f4c6..97d9a70 100644 --- a/lib/Makefile.elf-lib +++ b/lib/Makefile.elf-lib @@ -26,7 +26,7 @@ image: $(ELF_LIB) $(ELF_LIB): $(OBJS) @echo " GEN_ELF_SOLIB $(ELF_LIB)" - @(cd elfshared; $(CC) --shared -o $(ELF_LIB) \ + @(cd elfshared; $(CC) --shared -o $(ELF_LIB) $(LDFLAGS) \ -Wl,-soname,$(ELF_SONAME) $(OBJS) $(ELF_OTHER_LIBS)) @$(MV) elfshared/$(ELF_LIB) . @$(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME) diff --git a/lib/Makefile.solaris-lib b/lib/Makefile.solaris-lib index df4f8ad..b75c20e 100644 --- a/lib/Makefile.solaris-lib +++ b/lib/Makefile.solaris-lib @@ -25,8 +25,8 @@ image: $(ELF_LIB) $(ELF_LIB): $(OBJS) @echo " GEN_ELF_SOLIB $(ELF_LIB)" - @(cd elfshared; $(CC) --shared -o $(ELF_LIB) -Wl,-h,$(ELF_SONAME) \ - $(OBJS) $(ELF_OTHER_LIBS)) + @(cd elfshared; $(CC) --shared -o $(ELF_LIB) $(LDFLAGS) \ + -Wl,-h,$(ELF_SONAME) $(OBJS) $(ELF_OTHER_LIBS)) @$(MV) elfshared/$(ELF_LIB) . @$(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME) @$(LN) $(ELF_LIB) ../$(ELF_LIB) -- 1.8.3.1