Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fix darwin with macports libtool

the gnu/macports libtool does not understand -static.
Force to use darwin special /usr/bin/libtool
  • Loading branch information...
commit 7ce401edb1979db84aaa1acf5b54ef8c45720ca9 1 parent 0c08da3
@rurban rurban authored
View
3  3rdparty/dyncall/buildsys/bsdmake/osx.bsdmake
@@ -31,7 +31,8 @@ as_FLAGS =
LINK_DLL_CMD = $(CXX) -o $(.TARGET) -dynamiclib $(LDFLAGS) $(.ALLSRC) $(LIBS)
#LINK_DLL_CMD = $(LD) -o $(.TARGET) -dylib $(LDFLAGS) $(.ALLSRC) $(LIBS)
-LINK_LIB_CMD = libtool -static -o $(.TARGET) $(.ALLSRC)
+LINK_LIB_CMD = /usr/bin/libtool -static -o $(.TARGET) $(.ALLSRC)
+#LINK_LIB_CMD = ar -r $(.TARGET) $(.ALLSRC)
.if $(BUILD_ARCH) == "universal"
TARGET_ARCH = -arch i386 -arch ppc -arch x86_64
View
3  3rdparty/dyncall/buildsys/gmake/os/darwin.gmake
@@ -20,7 +20,8 @@
DLL_PREFIX=lib
DLL_SUFFIX=.dylib
-LIBTOOL_STATIC=libtool -static -o $@ $^
+# darwin libtool only, not macports/gnu libtool
+LIBTOOL_STATIC=/usr/bin/libtool -static -o $@ $^
ifdef BUILD_ARCH_universal
TARGET_ARCH?=-arch i386 -arch ppc -arch x86_64
View
2  3rdparty/dyncall/dyncall/Makefile.embedded
@@ -17,4 +17,4 @@ install: all
gzip -c dyncall.3 >${DESTDIR}${PREFIX}/man/man3/dyncall.3.gz
.PHONY: all clean install
osx-universal:
- CFLAGS="${CFLAGS} -arch i386 -arch x86_64 -arch ppc" ASFLAGS="${ASFLAGS} -arch i386 -arch x86_64 -arch ppc" AR="libtool" ARFLAGS="-static -o" ${MAKE_CMD} all
+ CFLAGS="${CFLAGS} -arch i386 -arch x86_64 -arch ppc" ASFLAGS="${ASFLAGS} -arch i386 -arch x86_64 -arch ppc" AR="/usr/bin/libtool" ARFLAGS="-static -o" ${MAKE_CMD} all
Please sign in to comment.
Something went wrong with that request. Please try again.