diff --git a/tools/targets.py b/tools/targets.py
index 21611349..42f49c4a 100644
--- a/tools/targets.py
+++ b/tools/targets.py
@@ -24,7 +24,7 @@ def using_clang(env):
     return "clang" in os.path.basename(env["CC"])
 
 
-def is_vanilla_clang(env):
+def is_clang_type(env, family_string):
     if not using_clang(env):
         return False
     try:
@@ -32,7 +32,7 @@ def is_vanilla_clang(env):
     except (subprocess.CalledProcessError, OSError):
         print("Couldn't parse CXX environment variable to infer compiler version.")
         return False
-    return not version.startswith("Apple")
+    return version.startswith(family_string)
 
 
 # Main tool definition
@@ -125,10 +125,10 @@ def generate(env):
             else:
                 env.Append(CCFLAGS=["-g2"])
         else:
-            if using_clang(env) and not is_vanilla_clang(env):
+            if using_clang(env) and is_clang_type(env, "Apple"):
                 # Apple Clang, its linker doesn't like -s.
                 env.Append(LINKFLAGS=["-Wl,-S", "-Wl,-x", "-Wl,-dead_strip"])
-            else:
+            elif is_clang_type(env, "clang"):
                 env.Append(LINKFLAGS=["-s"])
 
         if env["optimize"] == "speed":