Lines 224-237
Link Here
|
224 |
fi |
224 |
fi |
225 |
|
225 |
|
226 |
# Bug 282984 && Bug 295530 |
226 |
# Bug 282984 && Bug 295530 |
227 |
sed -e "s:\(^SYSTEM_VARIABLES\):CC="$(tc-getCC)"\nCXX="$(tc-getCXX)"\nCFLAGS=\"${CFLAGS}\"\nCXXFLAGS=\"${CXXFLAGS}\"\nLDFLAGS=\"${LDFLAGS}\"\n\1:" \ |
227 |
sed -e "/^SYSTEM_VARIABLES/i CC=\"$(tc-getCC)\"\nCXX=\"$(tc-getCXX)\"\nexport CFLAGS=\"${CFLAGS}\"\nexport CXXFLAGS=\"${CXXFLAGS}\"\nexport LDFLAGS=\"${LDFLAGS}\"" \ |
228 |
-i configure || die "sed qmake compilers failed" |
228 |
-i configure || die "sed qmake compilers failed" |
229 |
# bug 321335 |
229 |
# bug 321335 |
230 |
if version_is_at_least 4.6; then |
230 |
if version_is_at_least 4.6; then |
231 |
find ./config.tests/unix -name "*.test" -type f -exec grep -lZ \$MAKE '{}' \; | \ |
231 |
find ./config.tests/unix -name "*.test" -type f -exec grep -lZ \$MAKE '{}' \; | \ |
232 |
xargs -0 \ |
232 |
xargs -0 \ |
233 |
sed -e "s:\(\$MAKE\):\1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getCXX)" LINK="$(tc-getCXX)":g" \ |
233 |
sed -e "s:\(\$MAKE\):\1 CC=\"$(tc-getCC)\" CXX=\"$(tc-getCXX)\" LD=\"$(tc-getCXX)\" LINK=\"$(tc-getCXX)\":g" \ |
234 |
-i || die "sed test compilers failed" |
234 |
-i || die "sed test compilers failed" |
|
|
235 |
find ./config.tests -type f -name "*.test" -exec grep -lZ '^\(CXX\|L\)FLAGS' '{}' \; | \ |
236 |
xargs -0 \ |
237 |
sed -e '/^CXXFLAGS/ s/""/"$CXXFLAGS"/' \ |
238 |
-e '/^LFLAGS/ s/""/"$LFLAGS $LDFLAGS"/' \ |
239 |
-i || die "sed test flags failed" |
235 |
fi |
240 |
fi |
236 |
|
241 |
|
237 |
# Bug 172219 |
242 |
# Bug 172219 |