ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "add the local directory to the library search path for C/C++ block compilation" 

This reverts commit 4202665f5b.

The buffer file name is not always available (e.g., during export), so
it should not be relied upon, rather a header argument should be used.
This commit is contained in:
Eric Schulte 2012-03-31 11:39:13 -04:00
parent a3ca0e43e5
commit 18c68c13aa
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ob-C.el
View File

@ -96,15 +96,14 @@ or `org-babel-execute:C++'."
(progn (progn
(with-temp-file tmp-src-file (insert full-body)) (with-temp-file tmp-src-file (insert full-body))
(org-babel-eval (org-babel-eval
(format "%s -o %s %s %s -I \"%s\"" (format "%s -o %s %s %s"
(cond (cond
((equal org-babel-c-variant 'c) org-babel-C-compiler) ((equal org-babel-c-variant 'c) org-babel-C-compiler)
((equal org-babel-c-variant 'cpp) org-babel-C++-compiler)) ((equal org-babel-c-variant 'cpp) org-babel-C++-compiler))
(org-babel-process-file-name tmp-bin-file) (org-babel-process-file-name tmp-bin-file)
(mapconcat 'identity (mapconcat 'identity
(if (listp flags) flags (list flags)) " ") (if (listp flags) flags (list flags)) " ")
(org-babel-process-file-name tmp-src-file) (org-babel-process-file-name tmp-src-file)) ""))))
(file-name-directory (buffer-file-name))) ""))))
((lambda (results) ((lambda (results)
(org-babel-reassemble-table (org-babel-reassemble-table
(if (member "vector" (cdr (assoc :result-params params))) (if (member "vector" (cdr (assoc :result-params params)))