Unverified Commit 08b16365 authored by Summer Stapleton's avatar Summer Stapleton Committed by GitHub
Browse files

Merge pull request #415 from ihumphrey-usgs/cmake 

re-add gold linker for linux only
parents 28c5a291 72d0b089

isis/CMakeLists.txt

+4 −3
Original line number Diff line number Diff line
@@ -154,8 +154,6 @@ include(CTest) 
# sometimes third parties do not set their rpaths correctly

set(thirdPartyCppFlags -Wall

                       -fPIC

		       -fuse-ld=gold

		       -pthread

                       -std=c++11

                       -DISIS_LITTLE_ENDIAN=1

                       -Wno-unused-parameter
@@ -170,8 +168,11 @@ set(thirdPartyCppFlags -Wall 




# Flag to fix numeric literals problem with boost on linux

# Add gold linker (and therefore, phtread) to speed up linux (spec. Ubuntu18.04) builds

if(NOT APPLE)

  set(thirdPartyCppFlags ${thirdPartyCppFlags} -fext-numeric-literals

  set(thirdPartyCppFlags ${thirdPartyCppFlags} -fuse-ld=gold

	                                       -pthread

					       -fext-numeric-literals

                                               -Wl,-rpath,$ENV{CONDA_PREFIX}/lib)

endif()