Djam/chromium-browser-stable-slava86
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/chromium-browser-stable-slava86.git synced 2025-02-24 16:02:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't set extra_cxxflags, extra_ldflags

Browse source
This commit is contained in:
Mikhail Novosyolov 2018-10-16 10:16:28 +03:00
parent cda7025494
commit e13e1f3e1b
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
chromium-browser-stable.spec
View file

@ -431,6 +431,8 @@ CFLAGS="$CFLAGS -Wno-error=pointer-to-int-cast -Wno-error=int-to-pointer-cast"
CXXFLAGS="$CXXFLAGS -Wno-error=attributes -Wno-error=comment -Wno-error=unused-variable -Wno-error=strict-overflow -Wno-error=deprecated-declarations" CXXFLAGS="$CXXFLAGS -Wno-error=attributes -Wno-error=comment -Wno-error=unused-variable -Wno-error=strict-overflow -Wno-error=deprecated-declarations"
%endif %endif
echo "DEBUG: Compile flags are: CFLAGS: $CFLAGS , CXXFLAGS: $CXXFLAGS , LDFLAGS: $LDFLAGS" || true
# v NO TABS IN HERE! # v NO TABS IN HERE!
%define gn_config use_sysroot=false \ %define gn_config use_sysroot=false \
system_libdir="%{_lib}" \ system_libdir="%{_lib}" \
@ -475,11 +477,11 @@ CXXFLAGS="$CXXFLAGS -Wno-error=attributes -Wno-error=comment -Wno-error=unused-v
use_system_libpng=true \ use_system_libpng=true \
use_vaapi=%{is_vaapi} \ use_vaapi=%{is_vaapi} \
v8_use_external_startup_data=false \ v8_use_external_startup_data=false \
extra_cxxflags="${CXXFLAGS}" \
extra_ldflags="${LDFLAGS}" \
google_api_key="%{google_api_key}" \ google_api_key="%{google_api_key}" \
google_default_client_id="%{google_default_client_id}" \ google_default_client_id="%{google_default_client_id}" \
google_default_client_secret="%{google_default_client_secret}" google_default_client_secret="%{google_default_client_secret}"
#extra_cxxflags="${CXXFLAGS}" \
#extra_ldflags="${LDFLAGS}" \
#is_nacl_glibc=false \ #is_nacl_glibc=false \
#use_jumbo_build=true \ #use_jumbo_build=true \
#jumbo_file_merge_limit = %{is_limit} \ #jumbo_file_merge_limit = %{is_limit} \
@ -501,7 +503,6 @@ python tools/gn/bootstrap/bootstrap.py --gn-gen-args='%{gn_config}'
out/Release/gn gen --args='%{gn_config}' out/Release out/Release/gn gen --args='%{gn_config}' out/Release
pushd out/Release pushd out/Release
echo "DEBUG: Compile flags are: CFLAGS: $CFLAGS , CXXFLAGS: $CXXFLAGS , LDFLAGS: $LDFLAGS" || true
# widevinecdmadapter # widevinecdmadapter
# Build error with widevinecdmadapter in 67.0.3396.62 # Build error with widevinecdmadapter in 67.0.3396.62
ninja -vvv %{_smp_mflags} chrome chrome_sandbox chromedriver ninja -vvv %{_smp_mflags} chrome chrome_sandbox chromedriver