summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWayne Meissner <wmeissner@gmail.com>2010-03-10 12:47:55 +1000
committerWayne Meissner <wmeissner@gmail.com>2010-03-10 12:48:46 +1000
commitf0dff6c8154174282cfbccaf6e0fea5adc1d123e (patch)
tree7f413e07f66130aebb1d01562e15cf7be3c837c3
parent83e0b79132ac7d682904dd9e767aa42b8d1fae72 (diff)
downloadffi-f0dff6c8154174282cfbccaf6e0fea5adc1d123e.tar.gz
Add some hacks to get win32 cross compiling working again
-rw-r--r--ext/ffi_c/libffi.mk2
-rwxr-xr-xext/ffi_c/libffi/configure2
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/ffi_c/libffi.mk b/ext/ffi_c/libffi.mk
index 608f79c..fe5217a 100644
--- a/ext/ffi_c/libffi.mk
+++ b/ext/ffi_c/libffi.mk
@@ -7,7 +7,7 @@ $(LIBFFI):
@if [ ! -f $(LIBFFI_BUILD_DIR)/Makefile ]; then \
echo "Configuring libffi"; \
cd $(LIBFFI_BUILD_DIR) && \
- /usr/bin/env CC="$(CC)" LD="$(LD)" CFLAGS="$(LIBFFI_CFLAGS)" \
+ /usr/bin/env CFLAGS="$(LIBFFI_CFLAGS)" \
/bin/sh $(LIBFFI_CONFIGURE) $(LIBFFI_HOST) > /dev/null; \
fi
cd $(LIBFFI_BUILD_DIR) && $(MAKE)
diff --git a/ext/ffi_c/libffi/configure b/ext/ffi_c/libffi/configure
index d849c7a..0a44bae 100755
--- a/ext/ffi_c/libffi/configure
+++ b/ext/ffi_c/libffi/configure
@@ -9021,7 +9021,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
old_archive_from_new_cmds='true'
# FIXME: Should let the user specify the lib program.
old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
- fix_srcfile_path='`cygpath -w "$srcfile"`'
+# fix_srcfile_path='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes=yes
;;