branch, master, updated. v0.2-121-gc3101a1
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via c3101a15861dbf140dded3fcf34f33340ccef7df (commit) from 2d4f309fdfbfb9d9a9f82cdb8dc06e155156ebaa (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c3101a15861dbf140dded3fcf34f33340ccef7df Author: John Jenkins <[email protected]> Date: Wed Jan 21 13:38:21 2015 -0600 put aesop cpp flags after user-provided This helps to prevent stale-file issues when aesop is installed in the same directory as other aesop-using projects, and those other projects are being (re)built. ----------------------------------------------------------------------- Summary of changes: toolchain/bin/aecc-utils.in | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) Diff of changes: diff --git a/toolchain/bin/aecc-utils.in b/toolchain/bin/aecc-utils.in index f95b0af..a86b88c 100644 --- a/toolchain/bin/aecc-utils.in +++ b/toolchain/bin/aecc-utils.in @@ -587,7 +587,7 @@ doCPP() jcppopt="-D__blocking='' -Dpbranch='' -Dpwait='' -Dpbreak=''" fi runCmd $verbose "Preprocessing step failed:" \ - "${ccpath} -DAESOP_PARSER -x c ${jcppopt} -o ${cppout} ${AECC_CFLAGS} ${ccopts} ${cppinput}" + "${ccpath} -DAESOP_PARSER -x c ${jcppopt} -o ${cppout} ${ccopts} ${AECC_CFLAGS} ${cppinput}" return $? } @@ -611,7 +611,7 @@ parseAesopSource() printVerbose "parseAesopSource(): $input" runCmd $verbose "Aesop parsing step failed: " \ - "${AEPARSER} -c ${compiler} ${popts} -r ${namedinput} -o ${output} -i ${input} -- ${AECC_CFLAGS} ${compileropts}" + "${AEPARSER} -c ${compiler} ${popts} -r ${namedinput} -o ${output} -i ${input} -- ${compileropts} ${AECC_CFLAGS}" return $? } @@ -633,7 +633,7 @@ parseAesopHeader() fi runCmd $verbose "Aesop header parsing failed: " \ - "${AEPARSER} -c ${compiler} -j ${popts} -r ${namedinput} -o ${output} -i ${input} -- ${AECC_CFLAGS} ${compileropts}" + "${AEPARSER} -c ${compiler} -j ${popts} -r ${namedinput} -o ${output} -i ${input} -- ${compileropts} ${AECC_CFLAGS}" return $? } @@ -652,7 +652,7 @@ doCompile() printVerbose "doCompile()" runCmd $verbose "Compilation step failed: " \ - "${compiler} -x c -c -o ${outfile} ${AECC_CFLAGS} ${compileropts} ${infile}" + "${compiler} -x c -c -o ${outfile} ${compileropts} ${AECC_CFLAGS} ${infile}" return $? } hooks/post-receive --
participants (1)
-
noreply@mcs.anl.gov