diff --git a/src/tools/gcc.lua b/src/tools/gcc.lua index 48087940..00c63ddd 100644 --- a/src/tools/gcc.lua +++ b/src/tools/gcc.lua @@ -235,7 +235,7 @@ elseif path.isobjectfile(link) then table.insert(result, link) else - table.insert(result, "-l" .. path.getbasename(link)) + table.insert(result, "-l" .. path.getname(link)) end end diff --git a/tests/actions/make/cpp/test_make_linking.lua b/tests/actions/make/cpp/test_make_linking.lua index 4600a871..9349c182 100644 --- a/tests/actions/make/cpp/test_make_linking.lua +++ b/tests/actions/make/cpp/test_make_linking.lua @@ -138,4 +138,22 @@ ALL_LDFLAGS += $(LDFLAGS) -L../libs -s LIBS += -lSomeLib ]] +end + + + +-- +-- When referencing an external library with a period in the +-- file name make sure it appears correctly in the LIBS +-- directive. Currently the period and everything after it +-- is stripped +-- + + function suite.onExternalLibraryWithPath() + location "MyProject" + links { "libs/SomeLib-1.1" } + prepare { "libs", } + test.capture [[ + LIBS += -lSomeLib-1.1 + ]] end