Remove unnecessary ldflags.

The .def file is already in sources, which means GN will already add this flag automatically (cf `gn help sources`). No intended behavior change. Bug: none Change-Id: Ic8204bbdd9da47f3731d48e62ccfeb880ac9eddc Reviewed-on: https://swiftshader-review.googlesource.com/c/23528Reviewed-by: Nicolas Capens <nicolascapens@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com> Tested-by: Nico Weber <thakis@chromium.org>

Remove unnecessary ldflags.
a4afa24f · Nico Weber · 05069822 · a4afa24f · a4afa24f
Commit a4afa24f authored Jan 04, 2019 by Nico Weber
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 8 deletions

BUILD.gn src/OpenGL/libEGL/BUILD.gn +1 -3

BUILD.gn src/OpenGL/libGLESv2/BUILD.gn +3 -5

No files found.
--- a/src/OpenGL/libEGL/BUILD.gn
+++ b/src/OpenGL/libEGL/BUILD.gn
@@ -53,8 +53,8 @@ swiftshader_shared_library("swiftshader_libEGL") {
  sources = [
    "../../Common/SharedLibrary.cpp",
-    "../common/debug.cpp",
    "../common/Object.cpp",
+    "../common/debug.cpp",
    "Config.cpp",
    "Display.cpp",
    "Surface.cpp",
@@ -74,8 +74,6 @@ swiftshader_shared_library("swiftshader_libEGL") {
      "IOSurface.framework",
    ]
    ldflags = [ "-Wl,-install_name,@rpath/libswiftshader_libEGL.dylib" ]
-  } else if (is_win) {
-    ldflags = [ "/DEF:" + rebase_path("libGLESv2.def", root_build_dir) ]
  } else if (is_linux) {
    if (use_x11) {
      sources += [ "../../Main/libX11.cpp" ]

--- a/src/OpenGL/libGLESv2/BUILD.gn
+++ b/src/OpenGL/libGLESv2/BUILD.gn
@@ -123,13 +123,11 @@ swiftshader_shared_library("swiftshader_libGLESv2") {
    "libGLESv2.rc",
  ]
-  if (is_win) {
+  if (is_mac) {
-    ldflags = [ "/DEF:" + rebase_path("libGLESv2.def", root_build_dir) ]
-  } else if (is_mac) {
    ldflags = [ "-Wl,-install_name,@rpath/libswiftshader_libGLESv2.dylib" ]
  } else if (is_linux) {
-    ldflags =
+    ldflags = [ "-Wl,--version-script=" +
-        [ "-Wl,--version-script=" + rebase_path("libGLESv2.lds", root_build_dir) ]
+                rebase_path("libGLESv2.lds", root_build_dir) ]
  }
  configs = [ ":swiftshader_libGLESv2_private_config" ]