diff options
| author | Lukas Elsner <open@mindrunner.de> | 2014-11-03 11:37:41 +1000 |
|---|---|---|
| committer | Lukas Elsner <open@mindrunner.de> | 2014-11-03 11:37:41 +1000 |
| commit | 6c164718856e63c8ddad539528792ce16b177d33 (patch) | |
| tree | 32796cc067ca7a14088224c2a4613ecdeb6d8c08 /recipes-core/ecj | |
| parent | d2b75b615e4612f9fa05950c1d76d4a719e573d4 (diff) | |
| parent | d031686fedd1f88fb628a8a87916477208377146 (diff) | |
| download | meta-java-6c164718856e63c8ddad539528792ce16b177d33.tar.gz | |
Merge remote-tracking branch 'woglinde/dora' into test
Conflicts:
recipes-core/cacao/cacao_1.6.1.bb
Diffstat (limited to 'recipes-core/ecj')
| -rw-r--r-- | recipes-core/ecj/libecj-bootstrap.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-core/ecj/libecj-bootstrap.inc b/recipes-core/ecj/libecj-bootstrap.inc index 9e1cc1d..cd9d90f 100644 --- a/recipes-core/ecj/libecj-bootstrap.inc +++ b/recipes-core/ecj/libecj-bootstrap.inc | |||
| @@ -29,7 +29,7 @@ do_unpackpost() { | |||
| 29 | rm -rf META-INF | 29 | rm -rf META-INF |
| 30 | 30 | ||
| 31 | # Move source into separate subdir. | 31 | # Move source into separate subdir. |
| 32 | if [ -d org ]; then | 32 | if [ -d org -a ! -d source/org ]; then |
| 33 | mv org source/ | 33 | mv org source/ |
| 34 | fi | 34 | fi |
| 35 | # Remove stuff unneeded for the bootstrap compiler. | 35 | # Remove stuff unneeded for the bootstrap compiler. |