Commit f647fd53 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Fix the libffi ln handling on cygwin

iWe were adding c:/... to $PATH, but : is the separator
in $PATH.
parent efcbe14d
...@@ -34,6 +34,10 @@ endif ...@@ -34,6 +34,10 @@ endif
libffi_STATIC_LIB = libffi/build/inst/lib/libffi.a libffi_STATIC_LIB = libffi/build/inst/lib/libffi.a
ffi_HEADER = rts/dist/build/ffi.h ffi_HEADER = rts/dist/build/ffi.h
ifeq "$(OSTYPE)" "cygwin"
LIBFFI_PATH_MANGLE = PATH=$$(cygpath "$(TOP)")/libffi:$$PATH; export PATH;
endif
ifneq "$(BINDIST)" "YES" ifneq "$(BINDIST)" "YES"
$(libffi_STAMP_CONFIGURE): $(libffi_STAMP_CONFIGURE):
"$(RM)" $(RM_OPTS) $(libffi_STAMP_STATIC_CONFIGURE) "$(RM)" $(RM_OPTS) $(libffi_STAMP_STATIC_CONFIGURE)
...@@ -54,8 +58,7 @@ $(libffi_STAMP_CONFIGURE): ...@@ -54,8 +58,7 @@ $(libffi_STAMP_CONFIGURE):
# Because -Werror may be in SRC_CC_OPTS/SRC_LD_OPTS, we need to turn # Because -Werror may be in SRC_CC_OPTS/SRC_LD_OPTS, we need to turn
# warnings off or the compilation of libffi might fail due to warnings # warnings off or the compilation of libffi might fail due to warnings
cd libffi && \ cd libffi && \
PATH=$(TOP)/libffi:$$PATH; \ $(LIBFFI_PATH_MANGLE) \
export PATH; \
cd build && \ cd build && \
CC=$(CC_STAGE1) \ CC=$(CC_STAGE1) \
LD=$(LD) \ LD=$(LD) \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment