diff options
| author | Michael Paquier | 2012-07-13 04:38:02 +0000 |
|---|---|---|
| committer | Michael Paquier | 2012-07-13 04:43:57 +0000 |
| commit | 5655bc5b45a90c6500a375c789d34b07039b6d2b (patch) | |
| tree | 3d792a57badad4727aa749575a86ae38ebfe0484 | |
| parent | 4ecfc866de54c0327fbef19ff803257748bf8480 (diff) | |
Clean up remaining GIT conflicts due to merge a871778 in Makefile.shlib
Noticed by Andrew Wong
| -rw-r--r-- | src/Makefile.shlib | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/Makefile.shlib b/src/Makefile.shlib index 42d77d24ff..032982d30b 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -130,11 +130,7 @@ ifeq ($(PORTNAME), darwin) ifneq ($(SO_MAJOR_VERSION), 0) version_link = -compatibility_version $(SO_MAJOR_VERSION) -current_version $(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) endif -<<<<<<< HEAD - LINK.shared = $(COMPILER) -dynamiclib -install_name $(libdir)/lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX) $(version_link) $(exported_symbols_list) -multiply_defined suppress -undefined suppress -flat_namespace -======= - LINK.shared = $(COMPILER) -dynamiclib -install_name '$(libdir)/lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)' $(version_link) $(exported_symbols_list) -multiply_defined suppress ->>>>>>> c1d9579dd8bf3c921ca6bc2b62c40da6d25372e5 + LINK.shared = $(COMPILER) -dynamiclib -install_name '$(libdir)/lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)' $(version_link) $(exported_symbols_list) -multiply_defined suppress -undefined suppress -flat_namespace shlib = lib$(NAME).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)$(DLSUFFIX) shlib_major = lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX) else |