Skip to content

Commit c5c41bc

Browse files
committed
Fixing build on 64-bit linux.
1 parent de8c051 commit c5c41bc

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

build/build.xml

+11-8
Original file line numberDiff line numberDiff line change
@@ -341,18 +341,18 @@
341341
<antcall target="assemble">
342342
<param name="target.path" value="linux/work" />
343343
</antcall>
344-
</target>
345344

346-
<target name="linux32-build" depends="linux-build" description="Build linux (32-bit) version">
345+
<copy todir="linux/work" file="linux/dist/arduino" />
346+
<chmod perm="755" file="linux/work/arduino" />
347+
347348
<copy todir="linux/work/hardware">
348349
<fileset dir="linux/dist" includes="tools/**" />
349350
</copy>
350351

351352
<chmod perm="755" file="linux/work/hardware/tools/avrdude" />
353+
</target>
352354

353-
<copy todir="linux/work" file="linux/dist/arduino" />
354-
<chmod perm="755" file="linux/work/arduino" />
355-
355+
<target name="linux32-build" depends="linux-build" description="Build linux (32-bit) version">
356356
<!-- Unzip AVR tools -->
357357
<bunzip2 dest="linux" src="linux/avr_tools_linux32.tar.bz2" />
358358
<exec executable="tar" dir="linux/work/hardware">
@@ -362,12 +362,15 @@
362362
</target>
363363

364364
<target name="linux64-build" depends="linux-build" description="Build linux (64-bit) version">
365-
<copy tofile="linux/work/hardware/tools/avrdude" file="linux/dist/tools/avrdude64" />
366-
<copy tofile="linux/work/lib/librxtxSerial.so" file="linux/dist/lib/librxtxSerial64.so" />
365+
<copy tofile="linux/work/hardware/tools/avrdude" file="linux/dist/tools/avrdude64" overwrite="true" />
366+
<copy tofile="linux/work/lib/librxtxSerial.so" file="linux/dist/lib/librxtxSerial64.so" overwrite="true" />
367+
368+
<chmod perm="755" file="linux/work/hardware/tools/avrdude" />
369+
367370
<!-- Unzip AVR tools -->
368371
<bunzip2 dest="linux" src="linux/avr_tools_linux64.tar.bz2" />
369372
<exec executable="tar" dir="linux/work/hardware">
370-
<arg value="-xvf"/>
373+
<arg value="-xf"/>
371374
<arg value="../../avr_tools_linux64.tar"/>
372375
</exec>
373376
</target>

0 commit comments

Comments
 (0)