Commit 5d46cca0 authored by Manuel Pégourié-Gonnard's avatar Manuel Pégourié-Gonnard
Browse files

Require unix-utils in path for windows make

parent d72704b0
......@@ -18,6 +18,9 @@ Changes
"minimize" others (eg use stddef.h if only size_t is needed).
* Change #include lines in test files to use double quotes instead of angle
brackets for uniformity with the rest of the code.
* Building with 'make' on windows now requires Unix utilities in the PATH
as well as a Unix shell. This enables more features such as the 'check'
target.
= mbed TLS 1.3.10 released 2015-02-09
Security
......
......@@ -35,6 +35,12 @@ In order to run the tests, enter::
make check
If you're building on windows using mingw, msys, or some similar environment, you should define the WINDOWS variable (and possibly the CC variable too), eg::
make CC=gcc WINDOWS=1
You need to make sure the usual Unix utilities such as `ln` and `rm` are in your PATH and that make has access to a Unix shell.
Depending on your platform, you might run into some issues. Please check the Makefiles in *library/*, *programs/* and *tests/* for options to manually add or remove for specific platforms. You can also check `the mbed TLS Knowledge Base <https://polarssl.org/kb>`_ for articles on your platform or issue.
In case you find that you need to do something else as well, please let us know what, so we can add it to the KB.
......
......@@ -77,11 +77,7 @@ shared: libpolarssl.so
libpolarssl.a: libmbedtls.a
echo " LN $@ -> $?"
ifndef WINDOWS
ln -sf $? $@
else
copy /y /b $? $@
endif
libmbedtls.a: $(OBJS)
echo " AR $@"
......@@ -91,11 +87,7 @@ libmbedtls.a: $(OBJS)
libpolarssl.so: libmbedtls.so
echo " LN $@ -> $?"
ifndef WINDOWS
ln -sf $? $@
else
copy /y /b $? $@
endif
libmbedtls.${DLEXT}: $(OBJS)
echo " LD $@"
......@@ -118,9 +110,4 @@ libmbedtls.dll: $(OBJS)
$(CC) $(CFLAGS) $(OFLAGS) -c $<
clean:
ifndef WINDOWS
rm -f *.o libpolarssl.* libmbedtls.*
endif
ifdef WINDOWS
del /Q /F *.o libpolarssl.* libmbedtls.*
endif
......@@ -242,12 +242,7 @@ x509/cert_req: x509/cert_req.c ../library/libmbedtls.a
$(CC) $(CFLAGS) $(OFLAGS) x509/cert_req.c $(LDFLAGS) -o $@
clean:
ifndef WINDOWS
rm -f $(APPS)
endif
ifdef WINDOWS
del /S /Q /F *.o *.exe
endif
list:
echo $(APPS)
......@@ -402,15 +402,9 @@ test_suite_version: test_suite_version.c $(DEP)
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
clean:
ifndef WINDOWS
rm -f $(APPS) *.c
endif
ifdef WINDOWS
del /Q /F *.c *.exe
endif
check: $(APPS)
ifndef WINDOWS
echo "Running checks (Success if all tests PASSED)"
RETURN=0; \
for i in $(APPS); \
......@@ -427,4 +421,3 @@ ifndef WINDOWS
echo ""; \
done; \
if [ "$$RETURN" -eq 1 ]; then exit 1; fi
endif
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