diff options
author | Morgan Deters <mdeters@gmail.com> | 2010-09-30 21:39:14 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2010-09-30 21:39:14 +0000 |
commit | d0b49d588033ab8140bdf297c9cdf73b1088fe68 (patch) | |
tree | 991a27d038a10d81805f7f02e10f8c78d68579dd /Makefile.builds.in | |
parent | 1c2b7c593fa1c12575eb37e56a5c66a1a190ad81 (diff) |
fixed a number of problems with mac os x builds. build now works on mac os x if you disable the clock_gettime check in configure.ac (resolves bug #202), but the parser is broken (new bug #208)
Diffstat (limited to 'Makefile.builds.in')
-rw-r--r-- | Makefile.builds.in | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/Makefile.builds.in b/Makefile.builds.in index 83183e4a3..94f5235db 100644 --- a/Makefile.builds.in +++ b/Makefile.builds.in @@ -54,10 +54,21 @@ all: "$(abs_builddir)$(libdir)" ifeq ($(BUILDING_SHARED)$(STATIC_BINARY),10) # if we're building shared libs and the binary is not static, relink +# the handling with empty $relink_command is a hack for Mac OS thelibdir="$(abs_builddir)$(libdir)"; \ progdir="$(abs_builddir)$(bindir)"; file=cvc4; \ eval `grep '^relink_command=' $(CURRENT_BUILD)/src/main/cvc4 | sed 's:-Wl,-rpath:-Wl,-rpath -Wl,\\\\$$thelibdir -Wl,-rpath:'`; \ - eval "(cd $(CURRENT_BUILD)/src/main && $$relink_command)" + if test -z "$$relink_command"; then \ + $(mkinstalldirs) "$(CURRENT_BUILD)$(bindir)/.libs"; \ + $(install_sh) \ + $(CURRENT_BUILD)/src/main/.libs/cvc4 \ + "$(abs_builddir)$(bindir)/.libs"; \ + $(install_sh) \ + $(CURRENT_BUILD)/src/main/cvc4 \ + "$(abs_builddir)$(bindir)"; \ + else \ + eval "(cd $(CURRENT_BUILD)/src/main && $$relink_command)"; \ + fi else # if we're building static libs only, just install the driver binary directly $(install_sh) \ @@ -75,9 +86,20 @@ endif $(CURRENT_BUILD)/libtool --mode=install install -v $(CURRENT_BUILD)/src/parser/libcvc4parser.la "`pwd`$(libdir)" ifeq ($(BUILDING_SHARED)$(STATIC_BINARY),10) # if we're building shared libs and the binary is not static, relink +# the handling with empty $relink_command is a hack for Mac OS thelibdir="`pwd`$(libdir)"; progdir="`pwd`$(bindir)"; file=cvc4; \ eval `grep '^relink_command=' $(CURRENT_BUILD)/src/main/cvc4 | sed 's:-Wl,-rpath:-Wl,-rpath -Wl,\\\\$$thelibdir -Wl,-rpath:'`; \ - eval "(cd $(CURRENT_BUILD)/src/main && $$relink_command)" + if test -z "$$relink_command"; then \ + $(mkinstalldirs) ".$(bindir)/.libs"; \ + $(install_sh) \ + $(CURRENT_BUILD)/src/main/.libs/cvc4 \ + "`pwd`$(bindir)/.libs"; \ + $(install_sh) \ + $(CURRENT_BUILD)/src/main/cvc4 \ + "`pwd`$(bindir)"; \ + else \ + eval "(cd $(CURRENT_BUILD)/src/main && $$relink_command)"; \ + fi else # if we're building static libs only, just install the driver binary directly $(install_sh) $(CURRENT_BUILD)/src/main/cvc4 "`pwd`$(bindir)" |