diff options
| author | Silenio Quarti | 2012-10-18 15:01:10 +0000 |
|---|---|---|
| committer | Bogdan Gheorghe | 2012-10-18 16:26:11 +0000 |
| commit | e5ad328ca46878f518164a86b5708fe82ff0a69f (patch) | |
| tree | 8e289313fb0356f550119cb794ca56730934b8bd | |
| parent | 424a396d56adcad17eafe10fba71d9100f113ab7 (diff) | |
| download | eclipse.platform.swt-e5ad328ca46878f518164a86b5708fe82ff0a69f.tar.gz eclipse.platform.swt-e5ad328ca46878f518164a86b5708fe82ff0a69f.tar.xz eclipse.platform.swt-e5ad328ca46878f518164a86b5708fe82ff0a69f.zip | |
Bug 392214 - UnsatisfiedLinkError on Kepler
| -rw-r--r-- | bundles/org.eclipse.swt/buildSWT.xml | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml index 7c0921d9ef..e006fd5cf7 100644 --- a/bundles/org.eclipse.swt/buildSWT.xml +++ b/bundles/org.eclipse.swt/buildSWT.xml @@ -411,7 +411,10 @@ <arg line="diff ${SHA1}"/> </exec> <condition property="source_changed"> - <length string="${diffs}" trim="true" when="greater" length="0"/> + <or> + <length string="${SHA1}" trim="true" when="equal" length="0"/> + <length string="${diffs}" trim="true" when="greater" length="0"/> + </or> </condition> <echo>Has source changes: ${source_changed}, compared against:</echo> <exec dir="${repo.src}" executable="git" failonerror="true"> @@ -773,7 +776,10 @@ <!-- Check for changes --> <exec dir="${repo.src}" executable="git" failonerror="true" outputproperty="diffs"> - <arg line="diff ${SHA1} ${library_src}"/> + <or> + <length string="${SHA1}" trim="true" when="equal" length="0"/> + <length string="${diffs}" trim="true" when="greater" length="0"/> + </or> </exec> <condition property="natives_changed"> <length string="${diffs}" trim="true" when="greater" length="0"/> |