From a035bb74fb7caa80e16387de56fcee5f0718485d Mon Sep 17 00:00:00 2001 From: "K. Noel Belcourt" Date: Wed, 6 Aug 2014 10:00:28 -0600 Subject: [PATCH] Revert to Cray only compile options, removed others. --- src/tools/cray.jam | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/tools/cray.jam b/src/tools/cray.jam index 1fa1ddc01..a64f1080a 100644 --- a/src/tools/cray.jam +++ b/src/tools/cray.jam @@ -69,14 +69,11 @@ flags cray.compile DEFINES ; flags cray.compile INCLUDES ; flags cray.link OPTIONS ; -# flags cray.compile OPTIONS : -hgnu -fPIC -h system_alloc -h tolerant -h ipa0 ; -flags cray.compile OPTIONS : -march=bdver1 -mfpmath=sse -mfma4 -mavx -funroll-all-loops -mprefer-avx128 -fprefetch-loop-arrays --param prefetch-latency=300 -minline-all-stringops -ffast-math -fno-finite-math-only ; +flags cray.compile OPTIONS : -hgnu -fPIC -h system_alloc -h tolerant -h ipa0 ; flags cray.compile OPTIONS shared : -dynamic ; flags cray.compile OPTIONS static : -static ; -# flags cray.link OPTIONS static : -static ; -# flags cray.link OPTIONS shared ; -flags cray.link OPTIONS static : -static -march=bdver1 -mfpmath=sse -mfma4 -mavx -funroll-all-loops -mprefer-avx128 -fprefetch-loop-arrays --param prefetch-latency=300 -minline-all-stringops -ffast-math -fno-finite-math-only -Xlinker --allow-multiple-definition ; -flags cray.link OPTIONS shared : -march=bdver1 -mfpmath=sse -mfma4 -mavx -funroll-all-loops -mprefer-avx128 -fprefetch-loop-arrays --param prefetch-latency=300 -minline-all-stringops -ffast-math -fno-finite-math-only -Xlinker --allow-multiple-definition ; +flags cray.link OPTIONS static : -static ; +flags cray.link OPTIONS shared ; flags cray.link LOPTIONS shared : -dynamic ; flags cray.link LIBPATH ;