diff options
| author |   Eric Hameleers <alien@slackware.com> | 2018-08-04 09:46:06 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-08-04 09:46:06 +0000 |
| commit | 42b6d403c028478015af760d49acc42a24b4506c (patch) | |
| tree | d9dcc4fae7e7f3ecd457a85f90e0464050ae8f56 /chromium/build | |
| parent | 8017984fdfe4d0fc830ae1f89106709fc84074ee (diff) | |
| download | asb-42b6d403c028478015af760d49acc42a24b4506c.tar.gz asb-42b6d403c028478015af760d49acc42a24b4506c.tar.xz | |
chromium: make it compile again on 32bit
Diffstat (limited to 'chromium/build')
| -rwxr-xr-x | chromium/build/chromium.SlackBuild | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/chromium/build/chromium.SlackBuild b/chromium/build/chromium.SlackBuild index 934cab2d..c91424b6 100755 --- a/chromium/build/chromium.SlackBuild +++ b/chromium/build/chromium.SlackBuild @@ -736,6 +736,7 @@ _chromium_conf=( 'use_gconf=false' 'use_gold=false' 'use_kerberos=false' + 'use_lld=false' "use_pulseaudio=${do_pa}" 'use_sysroot=false' ) @@ -831,7 +832,8 @@ if [ ${USE_CLANG} -eq 1 -o ${USE_NACL} -eq 1 ]; then fi # Ensure that only this new clang is used, ignoring the system version: -export PATH="$TMP/tmp-$PRGNAM/${SRCNAM}-${VERSION}/third_party/llvm-build/Release+Asserts/bin:$PATH" +MYCLANG_PATH="$TMP/tmp-$PRGNAM/${SRCNAM}-${VERSION}/third_party/llvm-build/Release+Asserts/bin" +export PATH="$MYCLANG_PATH:$PATH" # Re-configure bundled ffmpeg to make it compile on 32bit Slackware: if [ ${FFMPEG_HEVC} -eq 1 -o "${FFMPEG_ARCH}" = "ia32" ]; then @@ -853,7 +855,7 @@ if [ ${FFMPEG_HEVC} -eq 1 -o "${FFMPEG_ARCH}" = "ia32" ]; then #sed -e "s/--extra-ldflags=-fuse-ld=lld/--extra-ldflags=''/" \ # -i chromium/scripts/build_ffmpeg.py # Actual reconfigure steps: - PATH="$TMP/tmp-$PRGNAM/${SRCNAM}-${VERSION}/third_party/llvm-build/Release+Asserts/bin:${PATH}" \ + PATH="$MYCLANG_PATH:${PATH}" \ python2 chromium/scripts/build_ffmpeg.py linux ${FFMPEG_ARCH} \ --branding ${FFMPEG_BRANDING} -- ${FFMPEG_CUSTOM_ARGS} \ 2>&1 | tee $OUTPUT/ffmpeg_configure-${PRGNAM}.log @@ -878,10 +880,11 @@ out/Release/gn gen out/Release -v --args="${_chromium_conf[*]}" \ echo "-- Compiling the lot." if [ "$USE_CLANG" = "1" ]; then - # clang_use_chrome_plugins=true fails with clang 3.5 - disable for now. - #export CC="clang" - #export CXX="clang++" # Use the clang that we build in-tree instead of using the system version: + # clang_use_chrome_plugins=true fails with clang 3.5 - disable for now. + #export CC="$MYCLANG_PATH/clang" + #export CXX="$MYCLANG_PATH/clang++" + #export LD="$MYCLANG_PATH/lld" unset CC unset CXX else |