Skip to content

Commit 24badb0

Browse files
committed
Removed "macosx-fix-bundled-toolchain-missing-symlinks" build task
This is no more needed since avrdude is compiled with libusb* statically linked
1 parent 0290830 commit 24badb0

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

Diff for: build/build.xml

-12
Original file line numberDiff line numberDiff line change
@@ -1154,7 +1154,6 @@
11541154

11551155
<move file="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc/avr" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
11561156
<move file="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
1157-
<antcall target="macosx-fix-bundled-toolchain-missing-symlinks"/>
11581157

11591158
<!-- XXX: This is a temporary hack to let the IDE select the correct bundled tools. -->
11601159
<!-- XXX: THE FOLLOWING LINES MUST BE REMOVED BEFORE MERGING! -->
@@ -1190,17 +1189,6 @@
11901189
<delete dir="${staging_folder}/work/${staging_hardware_folder}/tmp"/>
11911190
</target>
11921191

1193-
<target name="macosx-fix-bundled-toolchain-missing-symlinks" if="macosx">
1194-
<exec executable="mv" failonerror="true">
1195-
<arg value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude/lib/libusb.dylib"/>
1196-
<arg value="${staging_folder}/work/${staging_hardware_folder}/tools/avr/lib/"/>
1197-
</exec>
1198-
<exec executable="mv" failonerror="true">
1199-
<arg value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude/lib/libusb-1.0.dylib"/>
1200-
<arg value="${staging_folder}/work/${staging_hardware_folder}/tools/avr/lib/"/>
1201-
</exec>
1202-
</target>
1203-
12041192
<target name="generate-hourly-build-txt" if="hourly">
12051193
<echo file="${staging_folder}/work/${staging_hardware_folder}/../lib/hourlyBuild.txt">${BUILD_DATE}</echo>
12061194
</target>

0 commit comments

Comments
 (0)