diff options
| author | Vadim Zeitlin <vz-swig@zeitlins.org> | 2015-07-27 16:12:17 +0200 |
|---|---|---|
| committer | Vadim Zeitlin <vz-swig@zeitlins.org> | 2015-08-01 18:50:27 +0200 |
| commit | 2e7331964a39fc50fb04a8398f415a6d3b3b3732 (patch) | |
| tree | 1e34b562a4ba333dcad9d240f5b9f29a0186af4b /appveyor.yml | |
| parent | 2837550c4b1d1d5d6b3f366e164f97dee1ff78f2 (diff) | |
| download | swig-2e7331964a39fc50fb04a8398f415a6d3b3b3732.tar.gz | |
Use JAVA_HOME value in configure to detect Java.
This is simpler than having to use --with-java, --with-javac and
--with-javaincl options and, even more importantly, will usually just work by
default.
Diffstat (limited to 'appveyor.yml')
| -rw-r--r-- | appveyor.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/appveyor.yml b/appveyor.yml index 25abcb342..dc96d0bca 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -65,7 +65,7 @@ build_script: - set CCCL_OPTIONS=--cccl-muffle /W3 - set CHECK_OPTIONS=CSHARPOPTIONS=-platform:%Platform% # Open dummy file descriptor to fix error on cygwin: ./configure: line 560: 0: Bad file descriptor -- bash -c "exec 0</dev/null && ./autogen.sh && time ./configure --disable-dependency-tracking --disable-ccache CC=cccl CXX=cccl CFLAGS='-O2' CXXFLAGS='-O2' LDFLAGS='--cccl-link /LTCG' PCRE_CFLAGS='-I%PCRE_ROOT%/include -DPCRE_STATIC' PCRE_LIBS='-L%PCRE_ROOT%/lib/v110/%PCRE_PLATFORM%/Release/static/utf8 -lpcre8' --with-java='%JAVA_HOME%/bin/java.exe' --with-javac='%JAVA_HOME%/bin/javac.exe' --with-javaincl='%JAVA_HOME%/include' --without-perl5 --without-go --with-boost=C:/Libraries/boost || cat config.log" +- bash -c "exec 0</dev/null && ./autogen.sh && time ./configure --disable-dependency-tracking --disable-ccache CC=cccl CXX=cccl CFLAGS='-O2' CXXFLAGS='-O2' LDFLAGS='--cccl-link /LTCG' PCRE_CFLAGS='-I%PCRE_ROOT%/include -DPCRE_STATIC' PCRE_LIBS='-L%PCRE_ROOT%/lib/v110/%PCRE_PLATFORM%/Release/static/utf8 -lpcre8' --without-perl5 --without-go --with-boost=C:/Libraries/boost || cat config.log" - bash -c "time make -s" test_script: |