[gnome-sdk-images] rely on new ldflags and appending flags mode

[Alexander Larsson <alexl src gnome org>]

commit 273b1de8e28acc9b7e5754d08e77c7d1ee5746ea
Author: Alexander Larsson <alexl redhat com>
Date:   Tue Mar 14 12:10:31 2017 +0100

    rely on new ldflags and appending flags mode

 org.gnome.Sdk.json.in |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/org.gnome.Sdk.json.in b/org.gnome.Sdk.json.in
index 4c65bf2..a8b4365 100644
--- a/org.gnome.Sdk.json.in
+++ b/org.gnome.Sdk.json.in
@@ -53,9 +53,9 @@
     "build-options" : {
         "cflags": "-O2 -g -fstack-protector-strong -D_FORTIFY_SOURCE=2",
         "cxxflags": "-O2 -g -fstack-protector-strong -D_FORTIFY_SOURCE=2",
+        "ldflags": "-fstack-protector-strong -Wl,-z,relro,-z,now",
         "env": {
-            "V": "1",
-            "LDFLAGS": "-fstack-protector-strong -Wl,-z,relro,-z,now"
+            "V": "1"
         }
     },
     "modules": [
@@ -699,11 +699,9 @@
         {
             "name": "vte",
             "build-options" : {
-                "cflags": "-O2 -g  -fstack-protector-strong -D_FORTIFY_SOURCE=2 -fPIE -DPIE",
-                "cxxflags": "-O2 -g  -fstack-protector-strong -D_FORTIFY_SOURCE=2 -fPIE -DPIE",
-                "env": {
-                    "LDFLAGS": "-fstack-protector-strong -Wl,-z,relro -Wl,-z,now -pie -lssp"
-                }
+                "cflags": "-fPIE -DPIE",
+                "cxxflags": "-fPIE -DPIE",
+                "ldflags": "-pie -lssp"
             },
             "config-opts": ["--disable-gnome-pty-helper",
                             "--disable-static",
@@ -722,8 +720,8 @@
             "cleanup-platform": [ "/libexec/webkit2gtk-4.0/MiniBrowser" ],
             "cmake": true,
             "build-options" : {
-                "cflags": "-O2 -g1 -fstack-protector-strong -D_FORTIFY_SOURCE=2",
-                "cxxflags": "-O2 -g1 -fstack-protector-strong -D_FORTIFY_SOURCE=2",
+                "cflags": "-g1",
+                "cxxflags": "-g1",
                 "arch" : {
                     "i386" : {
                         "config-opts" : [