Workaround which avoids passing pic-related flags in link mode

diff --git a/build/library.mk b/build/library.mk
index 8cb86760e4e73dddabef5aea96f65ae6a8113311..06b885b2bfb8f52c0167d34f54a8aa8b060bca1d 100644 (file)
--- a/build/library.mk
+++ b/build/library.mk
@@ -20,4 +20,4 @@
 LTLIBRARY_OBJECTS = $(LTLIBRARY_SOURCES:.c=.lo) $(LTLIBRARY_OBJECTS_X)
 
 $(LTLIBRARY_NAME): $(LTLIBRARY_OBJECTS) $(LTLIBRARY_DEPENDENCIES)
-       $(LINK) $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_LIBADD)
+       $(LINK_CLEAN) $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_LIBADD)

diff --git a/build/program.mk b/build/program.mk
index f79feecb199f8fa30acbe0a1bc37fc0e505ef0a8..a06f8051819aa520b77ce6adbb88bccccfeba78d 100644 (file)
--- a/build/program.mk
+++ b/build/program.mk
@@ -20,4 +20,4 @@
 PROGRAM_OBJECTS = $(PROGRAM_SOURCES:.c=.lo)
 
 $(PROGRAM_NAME): $(PROGRAM_DEPENDENCIES) $(PROGRAM_OBJECTS)
-       $(LINK) $(PROGRAM_LDFLAGS) $(PROGRAM_OBJECTS) $(PROGRAM_LDADD)
+       $(LINK_CLEAN) $(PROGRAM_LDFLAGS) $(PROGRAM_OBJECTS) $(PROGRAM_LDADD)

diff --git a/build/rules_common.mk b/build/rules_common.mk
index bab3a16343fc6e0c621c28fd1f0fcafa1b5f3cdf..2c3c2701badfa8a4283fef7fd7f8a43cdc5237b5 100644 (file)
--- a/build/rules_common.mk
+++ b/build/rules_common.mk
@@ -27,6 +27,7 @@ SHARED_COMPILE = $(SHARED_LIBTOOL) --mode=compile $(CC) $(COMMON_FLAGS) $(CFLAGS
 CXX_SHARED_COMPILE = $(SHARED_LIBTOOL) --mode=compile $(CXX) $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) -prefer-pic $(EXTRA_CXXFLAGS) -c $< && touch $@
 
 LINK = $(LIBTOOL) --mode=link $(COMPILE) $(LDFLAGS) -o $@
+LINK_CLEAN = $(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@
 
 mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p
 INSTALL = $(top_srcdir)/build/shtool install -c