@@ -49,26 +49,28 @@ def autolocate_osx
49
49
]
50
50
end
51
51
52
- ret . gcc_cmd = [ File . join ( osx_root , "Java" , "hardware" , "tools" , "avr" , "bin" , "avr-gcc" ) ]
52
+ hardware_dir = File . join ( osx_root , "Java" , "hardware" )
53
+ ret . gcc_cmd = [ File . join ( hardware_dir , "tools" , "avr" , "bin" , "avr-gcc" ) ]
53
54
ret
54
55
end
55
56
56
57
def autolocate_linux
58
+ forced_avr = File . join ( force_install_location , "hardware" , "tools" , "avr" )
57
59
if USE_BUILDER
58
60
builder_name = "arduino-builder"
59
61
cli_place = Host . which ( builder_name )
60
62
unless cli_place . nil?
61
63
ret = ArduinoCmdLinuxBuilder . new
62
64
ret . base_cmd = [ cli_place ]
63
- ret . gcc_cmd = Host . which ( "avr-gcc" )
65
+ ret . gcc_cmd = [ Host . which ( "avr-gcc" ) ]
64
66
return ret
65
67
end
66
68
67
69
forced_builder = File . join ( force_install_location , builder_name )
68
70
if File . exist? ( forced_builder )
69
71
ret = ArduinoCmdLinuxBuilder . new
70
72
ret . base_cmd = [ forced_builder ]
71
- ret . gcc_cmd = [ File . join ( force_install_location , "hardware" , "tools" , "avr" , "bin" , "avr-gcc" ) ]
73
+ ret . gcc_cmd = [ File . join ( forced_avr , "bin" , "avr-gcc" ) ]
72
74
return ret
73
75
end
74
76
end
@@ -78,15 +80,15 @@ def autolocate_linux
78
80
unless gui_place . nil?
79
81
ret = ArduinoCmdLinux . new
80
82
ret . base_cmd = [ gui_place ]
81
- ret . gcc_cmd = Host . which ( "avr-gcc" )
83
+ ret . gcc_cmd = [ Host . which ( "avr-gcc" ) ]
82
84
return ret
83
85
end
84
86
85
87
forced_arduino = File . join ( force_install_location , gui_name )
86
88
if File . exist? ( forced_arduino )
87
89
ret = ArduinoCmdLinux . new
88
90
ret . base_cmd = [ forced_arduino ]
89
- ret . gcc_cmd = [ File . join ( force_install_location , "hardware" , "tools" , "avr" , "bin" , "avr-gcc" ) ]
91
+ ret . gcc_cmd = [ File . join ( forced_avr , "bin" , "avr-gcc" ) ]
90
92
return ret
91
93
end
92
94
nil
0 commit comments