diff --git a/tools/cpp/CROSSTOOL b/tools/cpp/CROSSTOOL
index d4e7fbb..55abdc4 100644
--- a/tools/cpp/CROSSTOOL
+++ b/tools/cpp/CROSSTOOL
@@ -228,7 +228,6 @@
   compiler_flag: "-D_FORTIFY_SOURCE=1"
   compiler_flag: "-fstack-protector"
   compiler_flag: "-fPIE"
-  linker_flag: "-pie"
   linker_flag: "-Wl,-z,relro,-z,now"
 
   # Pretty much everything needs this, including parts of the glibc STL...
@@ -280,6 +279,16 @@
     compiler_flag: "-fdata-sections"
     linker_flag: "-Wl,--gc-sections"
   }
+  feature {
+    name: "pie_for_linking"
+    enabled: true
+    flag_set {
+      action: "c++-link-executable"
+      flag_group {
+        flag: "-pie"
+      }
+    }
+  }
 }
 
 toolchain {
@@ -476,7 +485,6 @@
   compiler_flag: "-U_FORTIFY_SOURCE"
   compiler_flag: "-fstack-protector"
   compiler_flag: "-fPIE"
-  linker_flag: "-pie"
   linker_flag: "-Wl,-z,relro,-z,now"
 
   # Pretty much everything needs this, including parts of the glibc STL...
@@ -532,6 +540,16 @@
     compiler_flag: "-fdata-sections"
     linker_flag: "-Wl,--gc-sections"
   }
+  feature {
+    name: "pie_for_linking"
+    enabled: true
+    flag_set {
+      action: "c++-link-executable"
+      flag_group {
+        flag: "-pie"
+      }
+    }
+  }
 }
 
 toolchain {
@@ -730,7 +748,6 @@
   compiler_flag: "-U_FORTIFY_SOURCE"
   compiler_flag: "-fstack-protector"
   compiler_flag: "-fPIE"
-  linker_flag: "-pie"
   linker_flag: "-Wl,-z,relro,-z,now"
 
   # Pretty much everything needs this, including parts of the glibc STL...
@@ -782,6 +799,16 @@
     compiler_flag: "-fdata-sections"
     linker_flag: "-Wl,--gc-sections"
   }
+  feature {
+    name: "pie_for_linking"
+    enabled: true
+    flag_set {
+      action: "c++-link-executable"
+      flag_group {
+        flag: "-pie"
+      }
+    }
+  }
 }
 
 toolchain {