diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-12-07 14:45:50 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-12-07 14:45:50 +0100 |
| commit | 4cde96f8525f0c59f2037a981a4954da0224d224 (patch) | |
| tree | 4158761d685d839a20dd55945eef3ef8bb213704 | |
| parent | bd06d4ecd680701373f5903cae1a31746e5530c6 (diff) | |
| parent | 14cb29199246feabf3851f3e0d3f8b69da0d990d (diff) | |
| download | otp-4cde96f8525f0c59f2037a981a4954da0224d224.tar.gz otp-4cde96f8525f0c59f2037a981a4954da0224d224.tar.bz2 otp-4cde96f8525f0c59f2037a981a4954da0224d224.zip | |
Merge branch 'ia/inets/windows-comp' into maint
* ia/inets/windows-comp:
inets: Adjust makefile to new windows compiler
| -rw-r--r-- | lib/inets/test/httpd_SUITE_data/Makefile.src | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/inets/test/httpd_SUITE_data/Makefile.src b/lib/inets/test/httpd_SUITE_data/Makefile.src index b0fdb43d8d..cea40dd8cb 100644 --- a/lib/inets/test/httpd_SUITE_data/Makefile.src +++ b/lib/inets/test/httpd_SUITE_data/Makefile.src @@ -10,5 +10,10 @@ all: $(PROGS) cgi_echo@exe@: cgi_echo@obj@ $(LD) $(CROSSLDFLAGS) -o cgi_echo cgi_echo@obj@ @LIBS@ +@IFEQ@ (@CC@, cl -nologo) +cgi_echo@obj@: cgi_echo.c + $(CC) /c /Focgi_echo@obj@ $(CFLAGS) cgi_echo.c +@ELSE@ cgi_echo@obj@: cgi_echo.c $(CC) -c -o cgi_echo@obj@ $(CFLAGS) cgi_echo.c +@ENDIF@ |