Merge pull request #124 from github0null/dev

undo `getInternalDefines` function for armcc
github0null · May 9, 2022 · 7965940 · 7965940
2 parents c5dedb0 + cf1460b
commit 7965940
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,14 +4,13 @@
 
 ***
 
-### [v3.5.2]
+### [v3.5.3]
 
 **Fixed**:
   - Duplicated include path items: `.eide/deps` in project.
   - Can not parse old version `JLinkDevices.xml`.
 
 **Optimized**:
-  - Auto provide internal macros for `armcc` compiler by `--list_macros` command.
   - Optimize cpptools config provider for `gcc` family compilers.
 
 ***

diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
     "homepage": "https://github.com/github0null/eide/blob/master/README.md",
     "license": "MIT",
     "description": "A mcu development environment for 8051/AVR/STM8/Cortex-M/RISC-V",
-    "version": "3.5.2",
+    "version": "3.5.3",
     "preview": false,
     "engines": {
         "vscode": "^1.63.0"

diff --git a/src/ToolchainManager.ts b/src/ToolchainManager.ts
@@ -1088,6 +1088,12 @@ class AC5 implements IToolchian {
     //
     getInternalDefines<T extends BuilderConfigData>(builderCfg: T, builderOpts: ICompileOptions): string[] {
 
+        return [];
+
+        //
+        // 暂时禁用，c/c++ 插件暂时无法解析某些宏定义
+        //
+
         const cpuMap: { [key: string]: string } = {
             "cortex-m0": "Cortex-M0",
             "cortex-m0+": "Cortex-M0+",