diff --git a/src/actions/make/make_cpp.lua b/src/actions/make/make_cpp.lua index 7ad01e5c..ee42991c 100644 --- a/src/actions/make/make_cpp.lua +++ b/src/actions/make/make_cpp.lua @@ -401,7 +401,7 @@ function make.ldFlags(cfg, toolset) - local flags = table.join(toolset.getLibraryDirectories(cfg), toolset.getldflags(cfg)) + local flags = table.join(toolset.getLibraryDirectories(cfg), toolset.getldflags(cfg), cfg.linkoptions) _p(' ALL_LDFLAGS += $(LDFLAGS)%s', make.list(flags)) end diff --git a/src/actions/vstudio/vs200x_vcproj.lua b/src/actions/vstudio/vs200x_vcproj.lua index fd056e63..d5be822b 100644 --- a/src/actions/vstudio/vs200x_vcproj.lua +++ b/src/actions/vstudio/vs200x_vcproj.lua @@ -856,7 +856,7 @@ function m.additionalLinkerOptions(cfg, toolset) local flags if toolset then - flags = toolset.getldflags(cfg) + flags = table.join(toolset.getldflags(cfg), cfg.linkoptions) else flags = cfg.linkoptions end diff --git a/src/tools/clang.lua b/src/tools/clang.lua index 3ecae3a5..5a8df4ee 100644 --- a/src/tools/clang.lua +++ b/src/tools/clang.lua @@ -166,7 +166,6 @@ function clang.getldflags(cfg) local flags = config.mapFlags(cfg, clang.ldflags) - flags = table.join(flags, cfg.linkoptions) return flags end diff --git a/src/tools/gcc.lua b/src/tools/gcc.lua index 1c4865aa..c4fcd8ad 100644 --- a/src/tools/gcc.lua +++ b/src/tools/gcc.lua @@ -40,7 +40,6 @@ flags = { FatalCompileWarnings = "-Werror", NoFramePointer = "-fomit-frame-pointer", - Symbols = "-g" }, floatingpoint = { Fast = "-ffast-math", @@ -183,7 +182,6 @@ function gcc.getldflags(cfg) local flags = config.mapFlags(cfg, gcc.ldflags) - flags = table.join(flags, cfg.linkoptions) return flags end diff --git a/src/tools/msc.lua b/src/tools/msc.lua index 13a64c3a..e84757f8 100644 --- a/src/tools/msc.lua +++ b/src/tools/msc.lua @@ -168,7 +168,6 @@ function msc.getldflags(cfg) local map = iif(cfg.kind ~= premake.STATICLIB, msc.linkerFlags, msc.librarianFlags) local flags = config.mapFlags(cfg, map) - flags = table.join(flags, cfg.linkoptions) table.insert(flags, 1, "/NOLOGO") return flags end