From b4e48c0d3bbb99c066d5072c12a364a3bc057cb1 Mon Sep 17 00:00:00 2001 From: bungeman Date: Tue, 21 Jul 2020 01:54:59 -0400 Subject: [PATCH] [skia] Stop using gold. (#4164) The gold linker was forced when the system linker stopped linking the Skia build. It seems that the gold linker is now running into issues, so attempt to switch back. --- projects/skia/build.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/projects/skia/build.sh b/projects/skia/build.sh index 32bed6c38..dae2dbb93 100644 --- a/projects/skia/build.sh +++ b/projects/skia/build.sh @@ -49,11 +49,9 @@ popd DISABLE="-Wno-zero-as-null-pointer-constant -Wno-unused-template -Wno-cast-qual" # Disable UBSan vptr since target built with -fno-rtti. -# TODO(metzman): Stop using gold when -# bugs.chromium.org/p/oss-fuzz/issues/detail?id=16777 gets resolved. export CFLAGS="$CFLAGS $DISABLE -I$SWIFTSHADER_INCLUDE_PATH -DGR_EGL_TRY_GLES3_THEN_GLES2 -fno-sanitize=vptr" export CXXFLAGS="$CXXFLAGS $DISABLE -I$SWIFTSHADER_INCLUDE_PATH -DGR_EGL_TRY_GLES3_THEN_GLES2 -fno-sanitize=vptr "-DIS_FUZZING_WITH_LIBFUZZER"" -export LDFLAGS="$LIB_FUZZING_ENGINE $CXXFLAGS -L$SWIFTSHADER_LIB_PATH -fuse-ld=gold" +export LDFLAGS="$LIB_FUZZING_ENGINE $CXXFLAGS -L$SWIFTSHADER_LIB_PATH" # This splits a space separated list into a quoted, comma separated list for gn. export CFLAGS_ARR=`echo $CFLAGS | sed -e "s/\s/\",\"/g"`