let Nim pick C++ compiler correctly

arnetheduck · Jul 2, 2022 · 4355022 · 4355022
1 parent 677cd70
commit 4355022
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/Nim b/Nim
diff --git a/nlvm/nim.cfg b/nlvm/nim.cfg
@@ -5,15 +5,11 @@ path:"$lib/packages/docutils"
 
 define:nimOldCaseObjects
 
-# for wrapper module, we need C++
-gcc.linkerexe:"g++"
-gcc.options.always:"-std=c++14"
-
 passL:"-lpthread"
 
 define:nimcore
 
 @if staticLLVM:
   cc=clang
-  clang.linkerexe="clang++"
 @end
+
diff --git a/skipped-tests.txt b/skipped-tests.txt
@@ -235,13 +235,13 @@ tests/gc/weakrefs c  --gc:orc
 tests/gc/weakrefs c  --gc:orc -d:release
 tests/generics/tarc_misc.nim c
 tests/generics/tforwardgeneric.nim c
-tests/ic/tcompiletime_counter_temp.nim c  --incremental:on -d:nimIcIntegrityChecks 
-tests/ic/tconverter_temp.nim c  --incremental:on -d:nimIcIntegrityChecks 
-tests/ic/tgenerics_temp.nim c  --incremental:on -d:nimIcIntegrityChecks 
-tests/ic/thallo_temp.nim c  --incremental:on -d:nimIcIntegrityChecks 
-tests/ic/timports_temp.nim c  --incremental:on -d:nimIcIntegrityChecks 
-tests/ic/tmethods_temp.nim c  --incremental:on -d:nimIcIntegrityChecks 
-tests/ic/tstdlib_import_changed_temp.nim c  --incremental:on -d:nimIcIntegrityChecks 
+tests/ic/tcompiletime_counter_temp.nim c  --incremental:on -d:nimIcIntegrityChecks
+tests/ic/tconverter_temp.nim c  --incremental:on -d:nimIcIntegrityChecks
+tests/ic/tgenerics_temp.nim c  --incremental:on -d:nimIcIntegrityChecks
+tests/ic/thallo_temp.nim c  --incremental:on -d:nimIcIntegrityChecks
+tests/ic/timports_temp.nim c  --incremental:on -d:nimIcIntegrityChecks
+tests/ic/tmethods_temp.nim c  --incremental:on -d:nimIcIntegrityChecks
+tests/ic/tstdlib_import_changed_temp.nim c  --incremental:on -d:nimIcIntegrityChecks
 tests/import_in_config/tmain.nim c
 tests/iter/tshallowcopy_closures.nim c
 tests/iter/tyieldintry.nim c
@@ -271,8 +271,8 @@ tests/misc/trunner.nim c
 tests/misc/tsizeof.nim c
 tests/misc/tstrace.nim c
 tests/misc/ttlsemulation.nim c -d:nimTtlsemulationCase1 --threads --tlsEmulation:on
-tests/navigator/tincludefile_temp.nim c  --ic:on -d:nimIcNavigatorTests --hint:Conf:off --warnings:off 
-tests/navigator/tnav1_temp.nim c  --ic:on -d:nimIcNavigatorTests --hint:Conf:off --warnings:off 
+tests/navigator/tincludefile_temp.nim c  --ic:on -d:nimIcNavigatorTests --hint:Conf:off --warnings:off
+tests/navigator/tnav1_temp.nim c  --ic:on -d:nimIcNavigatorTests --hint:Conf:off --warnings:off
 tests/nimdoc/t15916.nim c
 tests/nimdoc/t17615.nim c
 tests/nimdoc/trunnableexamples2.nim c