Browse Source

Merge pull request #17 from vector-of-bool/feature/remove-fs-link-arg

Remove `-lstdc++fs` from the default link flags
default_compile_flags
vector-of-bool 4 years ago
parent
commit
5d642813ed
No account linked to committer's email address
2 changed files with 4 additions and 12 deletions
  1. +1
    -9
      src/dds/toolchain/from_dds.cpp
  2. +3
    -3
      src/dds/toolchain/from_dds.test.cpp

+ 1
- 9
src/dds/toolchain/from_dds.cpp View File

string_seq ret; string_seq ret;
if (is_msvc) { if (is_msvc) {
ret = {get_compiler(language::cxx), "/nologo", "/EHsc", "<IN>", "/Fe<OUT>"}; ret = {get_compiler(language::cxx), "/nologo", "/EHsc", "<IN>", "/Fe<OUT>"};
} else if (is_gnu) {
ret = {get_compiler(language::cxx),
"-fPIC",
"-fdiagnostics-color",
"<IN>",
"-pthread",
"-lstdc++fs",
"-o<OUT>"};
} else if (is_clang) {
} else if (is_gnu_like) {
ret = {get_compiler(language::cxx), ret = {get_compiler(language::cxx),
"-fPIC", "-fPIC",
"-fdiagnostics-color", "-fdiagnostics-color",

+ 3
- 3
src/dds/toolchain/from_dds.test.cpp View File

"g++ -fPIC -fdiagnostics-color -pthread -Wall -Wextra -Wpedantic -Wconversion " "g++ -fPIC -fdiagnostics-color -pthread -Wall -Wextra -Wpedantic -Wconversion "
"-MD -MF foo.o.d -MT foo.o -c foo.cpp -ofoo.o", "-MD -MF foo.o.d -MT foo.o -c foo.cpp -ofoo.o",
"ar rcs stuff.a foo.o bar.o", "ar rcs stuff.a foo.o bar.o",
"g++ -fPIC -fdiagnostics-color foo.o bar.a -pthread -lstdc++fs -omeow.exe");
"g++ -fPIC -fdiagnostics-color foo.o bar.a -pthread -omeow.exe");


check_tc_compile( check_tc_compile(
"Compiler-ID: GNU\nDebug: True", "Compiler-ID: GNU\nDebug: True",
"g++ -g -fPIC -fdiagnostics-color -pthread -Wall -Wextra -Wpedantic -Wconversion " "g++ -g -fPIC -fdiagnostics-color -pthread -Wall -Wextra -Wpedantic -Wconversion "
"-MD -MF foo.o.d -MT foo.o -c foo.cpp -ofoo.o", "-MD -MF foo.o.d -MT foo.o -c foo.cpp -ofoo.o",
"ar rcs stuff.a foo.o bar.o", "ar rcs stuff.a foo.o bar.o",
"g++ -fPIC -fdiagnostics-color foo.o bar.a -pthread -lstdc++fs -omeow.exe -g");
"g++ -fPIC -fdiagnostics-color foo.o bar.a -pthread -omeow.exe -g");


check_tc_compile( check_tc_compile(
"Compiler-ID: GNU\nDebug: True\nOptimize: True", "Compiler-ID: GNU\nDebug: True\nOptimize: True",
"g++ -O2 -g -fPIC -fdiagnostics-color -pthread -Wall -Wextra -Wpedantic -Wconversion " "g++ -O2 -g -fPIC -fdiagnostics-color -pthread -Wall -Wextra -Wpedantic -Wconversion "
"-MD -MF foo.o.d -MT foo.o -c foo.cpp -ofoo.o", "-MD -MF foo.o.d -MT foo.o -c foo.cpp -ofoo.o",
"ar rcs stuff.a foo.o bar.o", "ar rcs stuff.a foo.o bar.o",
"g++ -fPIC -fdiagnostics-color foo.o bar.a -pthread -lstdc++fs -omeow.exe -O2 -g");
"g++ -fPIC -fdiagnostics-color foo.o bar.a -pthread -omeow.exe -O2 -g");


check_tc_compile("Compiler-ID: MSVC", check_tc_compile("Compiler-ID: MSVC",
"cl.exe /MT /EHsc /nologo /permissive- /showIncludes /c foo.cpp /Fofoo.o", "cl.exe /MT /EHsc /nologo /permissive- /showIncludes /c foo.cpp /Fofoo.o",

Loading…
Cancel
Save