Mercurial > audlegacy
changeset 1627:b8c28d7e23cd trunk
[svn] - handle OS X linking command
| author | nenolod |
|---|---|
| date | Wed, 06 Sep 2006 13:37:57 -0700 |
| parents | 83769dcca55e |
| children | 3cd7cb58144e |
| files | ChangeLog mk/objective.mk |
| diffstat | 2 files changed, 18 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Sep 06 13:24:54 2006 -0700 +++ b/ChangeLog Wed Sep 06 13:37:57 2006 -0700 @@ -1,3 +1,12 @@ +2006-09-06 20:24:54 +0000 William Pitcock <nenolod@nenolod.net> + revision [2183] + - AC_SUBST(PICLDFLAGS) sorry + + + Changes: Modified: + +1 -0 trunk/configure.ac + + 2006-09-06 20:21:40 +0000 William Pitcock <nenolod@nenolod.net> revision [2181] - use $(SHARED_SUFFIX)
--- a/mk/objective.mk Wed Sep 06 13:24:54 2006 -0700 +++ b/mk/objective.mk Wed Sep 06 13:37:57 2006 -0700 @@ -179,11 +179,15 @@ if [ "x$(OBJECTS)" != "x" ]; then \ $(MAKE) $(OBJECTS) || exit; \ printf "%10s %-20s\n" LINK $@; \ - (if [ "x$(OBJECTIVE_SONAME_SUFFIX)" != "x" ]; then \ - $(CC) $(PICLDFLAGS) -o $@ -Wl,-soname=$@.$(OBJECTIVE_SONAME_SUFFIX) $(OBJECTS) $(LDFLAGS) $(LIBADD); \ - else \ - $(CC) $(PICLDFLAGS) -o $@ -Wl,-soname=$@ $(OBJECTS) $(LDFLAGS) $(LIBADD); \ - fi;) \ + (if [ "x$(SHARED_SUFFIX)" == "so" ]; then \ + (if [ "x$(OBJECTIVE_SONAME_SUFFIX)" != "x" ]; then \ + $(CC) $(PICLDFLAGS) -o $@ -Wl,-soname=$@.$(OBJECTIVE_SONAME_SUFFIX) $(OBJECTS) $(LDFLAGS) $(LIBADD); \ + else \ + $(CC) $(PICLDFLAGS) -o $@ -Wl,-soname=$@ $(OBJECTS) $(LDFLAGS) $(LIBADD); \ + fi;) \ + else \ + $(CC) $(PICLDFLAGS) -o $@ $(OBJECTS) $(LDFLAGS) $(LIBADD); \ + fi;) \ fi %.a: $(OBJECTS)