File tree 4 files changed +15
-0
lines changed
xmake/modules/package/tools
4 files changed +15
-0
lines changed Original file line number Diff line number Diff line change @@ -371,6 +371,9 @@ function buildenvs(package, opt)
371
371
if os .isdir (pkgconfig ) then
372
372
table.insert (PKG_CONFIG_PATH , pkgconfig )
373
373
end
374
+ end
375
+ -- some binary packages contain it too. e.g. libtool
376
+ for _ , dep in ipairs (package :orderdeps ()) do
374
377
local aclocal = path .join (dep :installdir (), " share" , " aclocal" )
375
378
if os .isdir (aclocal ) then
376
379
table.insert (ACLOCAL_PATH , aclocal )
@@ -396,6 +399,9 @@ function autogen_envs(package, opt)
396
399
if os .isdir (pkgconfig ) then
397
400
table.insert (PKG_CONFIG_PATH , pkgconfig )
398
401
end
402
+ end
403
+ -- some binary packages contain it too. e.g. libtool
404
+ for _ , dep in ipairs (package :orderdeps ()) do
399
405
local aclocal = path .join (dep :installdir (), " share" , " aclocal" )
400
406
if os .isdir (aclocal ) then
401
407
table.insert (ACLOCAL_PATH , aclocal )
Original file line number Diff line number Diff line change @@ -78,6 +78,9 @@ function buildenvs(package)
78
78
if os .isdir (pkgconfig ) then
79
79
table.insert (PKG_CONFIG_PATH , pkgconfig )
80
80
end
81
+ end
82
+ -- some binary packages contain it too. e.g. libtool
83
+ for _ , dep in ipairs (package :orderdeps ()) do
81
84
local aclocal = path .join (dep :installdir (), " share" , " aclocal" )
82
85
if os .isdir (aclocal ) then
83
86
table.insert (ACLOCAL_PATH , aclocal )
Original file line number Diff line number Diff line change @@ -405,6 +405,9 @@ function buildenvs(package, opt)
405
405
if os .isdir (pkgconfig ) then
406
406
table.insert (PKG_CONFIG_PATH , pkgconfig )
407
407
end
408
+ end
409
+ -- some binary packages contain it too. e.g. libtool
410
+ for _ , dep in ipairs (package :orderdeps ()) do
408
411
local aclocal = path .join (dep :installdir (), " share" , " aclocal" )
409
412
if os .isdir (aclocal ) then
410
413
table.insert (ACLOCAL_PATH , aclocal )
Original file line number Diff line number Diff line change @@ -84,6 +84,9 @@ function buildenvs(package, opt)
84
84
if os .isdir (pkgconfig ) then
85
85
table.insert (PKG_CONFIG_PATH , pkgconfig )
86
86
end
87
+ end
88
+ -- some binary packages contain it too. e.g. libtool
89
+ for _ , dep in ipairs (package :orderdeps ()) do
87
90
local aclocal = path .join (dep :installdir (), " share" , " aclocal" )
88
91
if os .isdir (aclocal ) then
89
92
table.insert (ACLOCAL_PATH , aclocal )
You can’t perform that action at this time.
0 commit comments