OSDN Git Service

Remove unnecessary ldflags.
authorNico Weber <thakis@chromium.org>
Fri, 4 Jan 2019 20:28:34 +0000 (15:28 -0500)
committerNico Weber <thakis@chromium.org>
Mon, 7 Jan 2019 16:17:07 +0000 (16:17 +0000)
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/23528
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Tested-by: Nico Weber <thakis@chromium.org>
src/OpenGL/libEGL/BUILD.gn
src/OpenGL/libGLESv2/BUILD.gn

index ab9b6fe..f4c826d 100644 (file)
@@ -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" ]
index cf12aaf..789ec35 100644 (file)
@@ -123,13 +123,11 @@ swiftshader_shared_library("swiftshader_libGLESv2") {
     "libGLESv2.rc",
   ]
 
-  if (is_win) {
-    ldflags = [ "/DEF:" + rebase_path("libGLESv2.def", root_build_dir) ]
-  } else if (is_mac) {
+  if (is_mac) {
     ldflags = [ "-Wl,-install_name,@rpath/libswiftshader_libGLESv2.dylib" ]
   } else if (is_linux) {
-    ldflags =
-        [ "-Wl,--version-script=" + rebase_path("libGLESv2.lds", root_build_dir) ]
+    ldflags = [ "-Wl,--version-script=" +
+                rebase_path("libGLESv2.lds", root_build_dir) ]
   }
 
   configs = [ ":swiftshader_libGLESv2_private_config" ]