summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2021-09-03 15:12:38 +0000
committer Eric Hameleers <alien@slackware.com>2021-09-03 15:12:38 +0000
commit777f8ccb4100a080929ad665ece586f605c2e6be (patch)
tree59edb013a71ce5cb2af9250440855bea5faa187b
parent25e0d48f7c3d36a0b8b2528b77eb95313ce44c0f (diff)
downloadasb-777f8ccb4100a080929ad665ece586f605c2e6be.tar.gz
asb-777f8ccb4100a080929ad665ece586f605c2e6be.tar.xz
chromium: we need these headers also to bootstrap gn
-rwxr-xr-xchromium/build/chromium.SlackBuild11
1 files changed, 7 insertions, 4 deletions
diff --git a/chromium/build/chromium.SlackBuild b/chromium/build/chromium.SlackBuild
index e2d79e07..5c6d681c 100755
--- a/chromium/build/chromium.SlackBuild
+++ b/chromium/build/chromium.SlackBuild
@@ -1105,10 +1105,6 @@ if [ ${USE_CLANG} -eq 1 ] && [ ${BUILD_CLANG} -eq 1 ]; then
--without-fuchsia \
2>&1 | tee $OUTPUT/clang_build-${PRGNAM}.log
#--llvm-force-head-revision \
- if [ -n "$HDR2REM" ]; then
- # Remove the temporary header symlinks we just created:
- ( cd /usr/include/c++/$(gcc -dumpversion)/bits/ && rm $HDR2REM)
- fi
# Ensure that only this new clang is used, ignoring the system version:
MYCLANG_PATH="$TMP/tmp-$PRGNAM/${SRCNAM}-${VERSION}/third_party/llvm-build/Release+Asserts/bin"
@@ -1166,6 +1162,13 @@ if [ ${USE_CLANG} -eq 1 ] && [ ${BUILD_CLANG} -eq 1 ]; then
rm $MYCLANG_PATH/ld
fi
+if [ ${USE_CLANG} -eq 1 ] && [ ${BUILD_CLANG} -eq 1 ]; then
+ if [ -n "$HDR2REM" ]; then
+ # Remove the temporary header symlinks we created earlier:
+ ( cd /usr/include/c++/$(gcc -dumpversion)/bits/ && rm $HDR2REM)
+ fi
+fi
+
echo "-- Generating ninja build files."
out/Release/gn gen out/Release -v --args="${_chromium_conf[*]}" \
2>&1 | tee -a $OUTPUT/gyp-${PRGNAM}.log