diff options
| author | Sascha Schumann <sas@php.net> | 2001-08-09 04:27:40 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2001-08-09 04:27:40 +0000 |
| commit | d0095ba3c53cba6dc8e751d63142f0701b042825 (patch) | |
| tree | 5b0bb05b3b4bd283959afb8dd5c8c01bc90fe151 /build | |
| parent | 80b870e5d3dc20f32e4c50672df56d450bd7d289 (diff) | |
| download | php-git-d0095ba3c53cba6dc8e751d63142f0701b042825.tar.gz | |
Workaround which avoids passing pic-related flags in link mode
Diffstat (limited to 'build')
| -rw-r--r-- | build/library.mk | 2 | ||||
| -rw-r--r-- | build/program.mk | 2 | ||||
| -rw-r--r-- | build/rules_common.mk | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/build/library.mk b/build/library.mk index 8cb86760e4..06b885b2bf 100644 --- 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 f79feecb19..a06f805181 100644 --- 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 bab3a16343..2c3c2701ba 100644 --- 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 |