diff --git a/bitmap2component/CMakeLists.txt b/bitmap2component/CMakeLists.txt
index 78b05c9f73..1b143d1dda 100644
--- a/bitmap2component/CMakeLists.txt
+++ b/bitmap2component/CMakeLists.txt
@@ -86,6 +86,6 @@ endif()
 
 if( false )     # linker map with cross reference
     set_target_properties( bitmap2component PROPERTIES
-        LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=bitmap2component.map"
+        LINK_FLAGS "-Wl,-cref,-Map=bitmap2component.map"
         )
 endif()
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index d6b835ac2d..c7a2645893 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -668,7 +668,7 @@ if( false ) # future
 
     if( MAKE_LINK_MAPS )
         set_target_properties( _kiway PROPERTIES
-            LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_kiway.so.map"
+            LINK_FLAGS "-Wl,-cref,-Map=_kiway.so.map"
             )
     endif()
 
diff --git a/cvpcb/CMakeLists.txt b/cvpcb/CMakeLists.txt
index d300ee44a3..7c8a1b2b6b 100644
--- a/cvpcb/CMakeLists.txt
+++ b/cvpcb/CMakeLists.txt
@@ -92,7 +92,7 @@ if( false ) # no CVPCB exe any more, only the *.kiface
         )
     if( MAKE_LINK_MAPS )
         set_target_properties( cvpcb PROPERTIES
-            LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=cvpcb.map" )
+            LINK_FLAGS "-Wl,-cref,-Map=cvpcb.map" )
     endif()
 
     if( APPLE )
@@ -182,7 +182,7 @@ set_source_files_properties( cvpcb.cpp PROPERTIES
 
 if( MAKE_LINK_MAPS )
     set_target_properties( cvpcb_kiface PROPERTIES
-        LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_cvpcb.kiface.map" )
+        LINK_FLAGS "-Wl,-cref,-Map=_cvpcb.kiface.map" )
 endif()
 
 # these 2 binaries are a matched set, keep them together:
diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index c56ac2d9cb..09ddf0618c 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -382,10 +382,10 @@ add_dependencies( eeschema eeschema_kiface )
 if( MAKE_LINK_MAPS )
     # generate link map with cross reference
     set_target_properties( eeschema_kiface PROPERTIES
-        LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=${KIFACE_PREFIX}eeschema${KIFACE_SUFFIX}.map"
+        LINK_FLAGS "-Wl,-cref,-Map=${KIFACE_PREFIX}eeschema${KIFACE_SUFFIX}.map"
         )
     set_target_properties( eeschema PROPERTIES
-        LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=eeschema.map"
+        LINK_FLAGS "-Wl,-cref,-Map=eeschema.map"
         )
 endif()
 
diff --git a/gerbview/CMakeLists.txt b/gerbview/CMakeLists.txt
index 66269d5e2d..958eb58d12 100644
--- a/gerbview/CMakeLists.txt
+++ b/gerbview/CMakeLists.txt
@@ -125,7 +125,7 @@ target_link_libraries( gerbview
 
 if( MAKE_LINK_MAPS )
     set_target_properties( gerbview PROPERTIES
-        LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=gerbview.map" )
+        LINK_FLAGS "-Wl,-cref,-Map=gerbview.map" )
 endif()
 
 # the main gerbview program, in DSO form.
@@ -160,7 +160,7 @@ set_source_files_properties( gerbview.cpp PROPERTIES
 
 if( MAKE_LINK_MAPS )
     set_target_properties( gerbview_kiface PROPERTIES
-        LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_gerbview.kiface.map" )
+        LINK_FLAGS "-Wl,-cref,-Map=_gerbview.kiface.map" )
 endif()
 
 # if building gerbview, then also build gerbview_kiface if out of date.
diff --git a/pagelayout_editor/CMakeLists.txt b/pagelayout_editor/CMakeLists.txt
index 5e013398b3..366eb9117a 100644
--- a/pagelayout_editor/CMakeLists.txt
+++ b/pagelayout_editor/CMakeLists.txt
@@ -97,7 +97,7 @@ target_link_libraries( pl_editor
 
 if( MAKE_LINK_MAPS )
     set_target_properties( pl_editor PROPERTIES
-        LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=pl_editor.map" )
+        LINK_FLAGS "-Wl,-cref,-Map=pl_editor.map" )
 endif()
 
 # the main pl_editor program, in DSO form.
@@ -132,7 +132,7 @@ set_source_files_properties( pl_editor.cpp PROPERTIES
 
 if( MAKE_LINK_MAPS )
     set_target_properties( pl_editor_kiface PROPERTIES
-        LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_pl_editor.kiface.map" )
+        LINK_FLAGS "-Wl,-cref,-Map=_pl_editor.kiface.map" )
 endif()
 
 # if building pl_editor, then also build pl_editor_kiface if out of date.
diff --git a/pcb_calculator/CMakeLists.txt b/pcb_calculator/CMakeLists.txt
index e040451298..23188e167d 100644
--- a/pcb_calculator/CMakeLists.txt
+++ b/pcb_calculator/CMakeLists.txt
@@ -72,7 +72,7 @@ target_link_libraries( pcb_calculator
 
 if( MAKE_LINK_MAPS )
     set_target_properties( pcb_calculator PROPERTIES
-        LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=pcb_calculator.map" )
+        LINK_FLAGS "-Wl,-cref,-Map=pcb_calculator.map" )
 endif()
 
 # the main pcb_calculator program, in DSO form.
@@ -96,7 +96,7 @@ set_source_files_properties( pcb_calculator.cpp PROPERTIES
 
 if( MAKE_LINK_MAPS )
     set_target_properties( pcb_calculator_kiface PROPERTIES
-        LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_pcb_calculator.kiface.map" )
+        LINK_FLAGS "-Wl,-cref,-Map=_pcb_calculator.kiface.map" )
 endif()
 
 # if building pcb_calculator, then also build pcb_calculator_kiface if out of date.
diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index 1d3cc5cf54..3bbdd87235 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -631,7 +631,7 @@ target_link_libraries( pcbnew
 
 if( PCBNEW_LINK_MAPS )
     set_target_properties( pcbnew PROPERTIES
-        LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=pcbnew.map" )
+        LINK_FLAGS "-Wl,-cref,-Map=pcbnew.map" )
 endif()
 
 # the main pcbnew program, in DSO form.
@@ -699,10 +699,10 @@ set_source_files_properties( pcbnew.cpp PROPERTIES
 
 if( PCBNEW_LINK_MAPS )
     set_target_properties( pcbnew_kiface PROPERTIES
-        LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_pcbnew.kiface.map"
+        LINK_FLAGS "-Wl,-cref,-Map=_pcbnew.kiface.map"
         )
     set_target_properties( pcbnew PROPERTIES
-        LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=pcbnew.map"
+        LINK_FLAGS "-Wl,-cref,-Map=pcbnew.map"
         )
 endif()