diff options
| author | Johann <johannkoenig@google.com> | 2011-06-08 11:36:04 -0700 |
|---|---|---|
| committer | Code Review <code-review@webmproject.org> | 2011-06-08 11:36:04 -0700 |
| commit | abb7c2181e05e2fcf13f700c2ad0b8ce0ce4d43a (patch) | |
| tree | ada085f73d47c4f961b544ff189764c4375d7d8a /build/make/Makefile | |
| parent | c73eb2ffff674e4e9fa7d5209d531aeec6ac5edd (diff) | |
| download | libvpx-abb7c2181e05e2fcf13f700c2ad0b8ce0ce4d43a.tar libvpx-abb7c2181e05e2fcf13f700c2ad0b8ce0ce4d43a.tar.gz libvpx-abb7c2181e05e2fcf13f700c2ad0b8ce0ce4d43a.tar.bz2 libvpx-abb7c2181e05e2fcf13f700c2ad0b8ce0ce4d43a.zip | |
Revert "Use shared object files for ELF"
Broke RVCT. New magic coming for ICC. Stay tuned!
This reverts commit c73eb2ffff674e4e9fa7d5209d531aeec6ac5edd
Diffstat (limited to 'build/make/Makefile')
| -rwxr-xr-x | build/make/Makefile | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/build/make/Makefile b/build/make/Makefile index 011177cf7..a951e99bc 100755 --- a/build/make/Makefile +++ b/build/make/Makefile @@ -220,14 +220,11 @@ define so_template # for creating them. # # This needs further abstraction for dealing with non-GNU linkers. -comma := , $(1): $(if $(quiet),@echo " [LD] $$@") $(qexec)$$(LD) -shared $$(LDFLAGS) \ - -Wl,--no-undefined \ - $$(if $$(SONAME), -Wl$$(comma)-soname$$(comma)$$(SONAME)) \ - $$(if $$(SO_VERSION_SCRIPT), -Wl$$(comma)--version-script$$(comma)$$(SO_VERSION_SCRIPT)) \ - -o $$@ \ + -Wl,--no-undefined -Wl,-soname,$$(SONAME) \ + -Wl,--version-script,$$(SO_VERSION_SCRIPT) -o $$@ \ $$(filter %.o,$$?) $$(extralibs) endef @@ -294,7 +291,7 @@ LIBS=$(call enabled,LIBS) .libs: $(LIBS) @touch $@ $(foreach lib,$(filter %_g.a,$(LIBS)),$(eval $(call archive_template,$(lib)))) -$(foreach lib,$(filter %.so %so.$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH),$(LIBS)),$(eval $(call so_template,$(lib)))) +$(foreach lib,$(filter %so.$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH),$(LIBS)),$(eval $(call so_template,$(lib)))) INSTALL-LIBS=$(call cond_enabled,CONFIG_INSTALL_LIBS,INSTALL-LIBS) ifeq ($(MAKECMDGOALS),dist) |