Fixed issue with invalid LD script if path contains space

2018-06-09 00:48:42 +03:00
parent 75754a4750
commit f9fde5d627
3 changed files with 21 additions and 10 deletions
@@ -231,14 +231,25 @@ def GetActualLDScript(env):
        return None

    script = None
+    script_in_next = False
    for f in env.get("LINKFLAGS", []):
-        if f.startswith("-Wl,-T"):
-            script = env.subst(f[6:].replace('"', "").strip())
-            if isfile(script):
-                return script
-            path = _lookup_in_ldpath(script)
-            if path:
-                return path
+        raw_script = None
+        if f == "-T":
+            script_in_next = True
+            continue
+        elif script_in_next:
+            script_in_next = False
+            raw_script = f
+        elif f.startswith("-Wl,-T"):
+            raw_script = f[6:]
+        else:
+            continue
+        script = env.subst(raw_script.replace('"', "").strip())
+        if isfile(script):
+            return script
+        path = _lookup_in_ldpath(script)
+        if path:
+            return path

    if script:
        sys.stderr.write(