fix!: resolve issue with relative paths during linking (#284)

Dw9 · web-flow · commit a2d7439fbd3c · 2025-03-24T08:10:16.000+08:00
* fix: resolve issue with relative paths during linking

* update docs/InputFormatReference.md

* update test.target.mk
diff --git a/docs/InputFormatReference.md b/docs/InputFormatReference.md
@@ -194,6 +194,7 @@ lists associated with the following keys, are treated as pathnames:
   * include\_dirs
   * inputs
   * libraries
+  * library\_dirs
   * outputs
   * sources
   * mac\_bundle\_resources
@@ -231,7 +232,8 @@ Source dictionary from `../build/common.gypi`:
 ```
 {
   'include_dirs': ['include'],  # Treated as relative to ../build
-  'libraries': ['-lz'],  # Not treated as a pathname, begins with a dash
+  'library_dirs': ['lib'],      # Treated as relative to ../build
+  'libraries': ['-lz'],   # Not treated as a pathname, begins with a dash
   'defines': ['NDEBUG'],  # defines does not contain pathnames
 }
 ```
@@ -250,6 +252,7 @@ Merged dictionary:
 {
   'sources': ['string_util.cc'],
   'include_dirs': ['../build/include'],
+  'library_dirs': ['../build/lib'],
   'libraries': ['-lz'],
   'defines': ['NDEBUG'],
 }
diff --git a/pylib/gyp/generator/make.py b/pylib/gyp/generator/make.py
@@ -1738,7 +1738,8 @@ def WriteTarget(
                         # into the link command, so we need lots of escaping.
                         ldflags.append(r"-Wl,-rpath=\$$ORIGIN/")
                         ldflags.append(r"-Wl,-rpath-link=\$(builddir)/")
-                library_dirs = config.get("library_dirs", [])
+                if library_dirs := config.get("library_dirs", []):
+                    library_dirs = [Sourceify(self.Absolutify(i)) for i in library_dirs]
                 ldflags += [("-L%s" % library_dir) for library_dir in library_dirs]
                 self.WriteList(ldflags, "LDFLAGS_%s" % configname)
                 if self.flavor == "mac":
diff --git a/test/fixtures/expected-darwin/make/test.target.mk b/test/fixtures/expected-darwin/make/test.target.mk
@@ -61,7 +61,7 @@ LDFLAGS_Default := \
 	-arch \
 	x86_64 \
 	-L$(builddir) \
-	-Lmylib
+	-L$(srcdir)/mylib
 
 LIBTOOLFLAGS_Default :=
 
diff --git a/test/fixtures/expected-linux/make/test.target.mk b/test/fixtures/expected-linux/make/test.target.mk
@@ -44,7 +44,7 @@ $(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj)/%.cc FORCE_DO_CMD
 # End of this set of suffix rules
 ### Rules for final target.
 LDFLAGS_Default := \
-	-Lmylib
+	-L$(srcdir)/mylib
 
 LIBS :=
 

Original file line number	Diff line number	Diff line change
`@@ -194,6 +194,7 @@ lists associated with the following keys, are treated as pathnames:`
`194`	`194`	`* include\_dirs`
`195`	`195`	`* inputs`
`196`	`196`	`* libraries`
	`197`	`+ * library\_dirs`
`197`	`198`	`* outputs`
`198`	`199`	`* sources`
`199`	`200`	`* mac\_bundle\_resources`
@@ -231,7 +232,8 @@ Source dictionary from `../build/common.gypi`:
`231`	`232`	```
`232`	`233`	`{`
`233`	`234`	`'include_dirs': ['include'], # Treated as relative to ../build`
`234`		`- 'libraries': ['-lz'], # Not treated as a pathname, begins with a dash`
	`235`	`+ 'library_dirs': ['lib'], # Treated as relative to ../build`
	`236`	`+ 'libraries': ['-lz'], # Not treated as a pathname, begins with a dash`
`235`	`237`	`'defines': ['NDEBUG'], # defines does not contain pathnames`
`236`	`238`	`}`
`237`	`239`	```
`@@ -250,6 +252,7 @@ Merged dictionary:`
`250`	`252`	`{`
`251`	`253`	`'sources': ['string_util.cc'],`
`252`	`254`	`'include_dirs': ['../build/include'],`
	`255`	`+ 'library_dirs': ['../build/lib'],`
`253`	`256`	`'libraries': ['-lz'],`
`254`	`257`	`'defines': ['NDEBUG'],`
`255`	`258`	`}`