diff options
Diffstat (limited to 'meta/classes/icecc.bbclass')
-rw-r--r-- | meta/classes/icecc.bbclass | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass index 56cbd6444f..724074231d 100644 --- a/meta/classes/icecc.bbclass +++ b/meta/classes/icecc.bbclass | |||
@@ -33,7 +33,6 @@ def icc_determine_gcc_version(gcc): | |||
33 | 33 | ||
34 | 'i686-apple-darwin8-gcc-4.0.1 (GCC) 4.0.1 (Apple Computer, Inc. build 5363)' | 34 | 'i686-apple-darwin8-gcc-4.0.1 (GCC) 4.0.1 (Apple Computer, Inc. build 5363)' |
35 | """ | 35 | """ |
36 | import os | ||
37 | return os.popen("%s --version" % gcc ).readline().split()[2] | 36 | return os.popen("%s --version" % gcc ).readline().split()[2] |
38 | 37 | ||
39 | def create_cross_env(bb,d): | 38 | def create_cross_env(bb,d): |
@@ -47,7 +46,7 @@ def create_cross_env(bb,d): | |||
47 | if len(prefix) == 0: | 46 | if len(prefix) == 0: |
48 | return "" | 47 | return "" |
49 | 48 | ||
50 | import tarfile, socket, time, os | 49 | import tarfile, socket, time |
51 | ice_dir = bb.data.expand('${CROSS_DIR}', d) | 50 | ice_dir = bb.data.expand('${CROSS_DIR}', d) |
52 | prefix = bb.data.expand('${HOST_PREFIX}' , d) | 51 | prefix = bb.data.expand('${HOST_PREFIX}' , d) |
53 | distro = bb.data.expand('${DISTRO}', d) | 52 | distro = bb.data.expand('${DISTRO}', d) |
@@ -96,7 +95,7 @@ def create_cross_env(bb,d): | |||
96 | 95 | ||
97 | def create_native_env(bb,d): | 96 | def create_native_env(bb,d): |
98 | 97 | ||
99 | import tarfile, socket, time, os | 98 | import tarfile, socket, time |
100 | ice_dir = bb.data.expand('${CROSS_DIR}', d) | 99 | ice_dir = bb.data.expand('${CROSS_DIR}', d) |
101 | prefix = bb.data.expand('${HOST_PREFIX}' , d) | 100 | prefix = bb.data.expand('${HOST_PREFIX}' , d) |
102 | distro = bb.data.expand('${DISTRO}', d) | 101 | distro = bb.data.expand('${DISTRO}', d) |
@@ -137,7 +136,7 @@ def create_native_env(bb,d): | |||
137 | 136 | ||
138 | def create_cross_kernel_env(bb,d): | 137 | def create_cross_kernel_env(bb,d): |
139 | 138 | ||
140 | import tarfile, socket, time, os | 139 | import tarfile, socket, time |
141 | ice_dir = bb.data.expand('${CROSS_DIR}', d) | 140 | ice_dir = bb.data.expand('${CROSS_DIR}', d) |
142 | prefix = bb.data.expand('${HOST_PREFIX}' , d) | 141 | prefix = bb.data.expand('${HOST_PREFIX}' , d) |
143 | distro = bb.data.expand('${DISTRO}', d) | 142 | distro = bb.data.expand('${DISTRO}', d) |
@@ -204,8 +203,6 @@ def create_path(compilers, type, bb, d): | |||
204 | """ | 203 | """ |
205 | Create Symlinks for the icecc in the staging directory | 204 | Create Symlinks for the icecc in the staging directory |
206 | """ | 205 | """ |
207 | import os | ||
208 | |||
209 | staging = os.path.join(bb.data.expand('${STAGING_DIR}', d), "ice", type) | 206 | staging = os.path.join(bb.data.expand('${STAGING_DIR}', d), "ice", type) |
210 | 207 | ||
211 | #check if the icecc path is set by the user | 208 | #check if the icecc path is set by the user |