瀏覽代碼

Restore "-U __GNUC__" to preprocessor command
Log correct directory on failures


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@42485 15284696-431f-4ddb-bdfa-cd5b030d7da7

Glynn Clements 15 年之前
父節點
當前提交
1fe453a5fc
共有 2 個文件被更改,包括 2 次插入3 次删除
  1. 1 1
      lib/python/Makefile
  2. 1 2
      lib/python/ctypes/ctypesgencore/parser/preprocessor.py

+ 1 - 1
lib/python/Makefile

@@ -16,7 +16,7 @@ PYCFILES := $(patsubst %,$(DSTDIR)/%.pyc,$(MODULES) __init__)
 CLEAN_SUBDIRS = ctypes
 
 default: $(PYFILES) $(PYCFILES) $(GDIR)/__init__.py $(GDIR)/__init__.pyc
-	-$(MAKE) -C ctypes || echo $(CURDIR)/$@ >> $(ERRORLOG)
+	-$(MAKE) -C ctypes || echo $(CURDIR)/ctypes >> $(ERRORLOG)
 
 $(PYDIR):
 	$(MKDIR) $@

+ 1 - 2
lib/python/ctypes/ctypesgencore/parser/preprocessor.py

@@ -131,8 +131,7 @@ class PreprocessorParser(object):
         cmd = self.options.cpp
         if sys.platform == 'darwin':
             cmd += " -U __BLOCKS__"
-        else:
-            cmd += " -U __GNUC__"
+        cmd += " -U __GNUC__"
         cmd += " -dD"
         for path in self.options.include_search_paths:
             cmd += " -I%s" % path