Commitf46c4ff

committed

Revert "trying to fix macOS port with mbedtls"

This reverts commite3aebc3.

1 parente3aebc3 commitf46c4ffCopy full SHA for f46c4ff

File tree

1 file changed

-32

lines changed

builder
- macOS.py

1 file changed

-32

lines changed

`‎builder/macOS.py‎`

Lines changed: 8 additions & 32 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,12 @@`
`15`	`15`	`from .importunix`
`16`	`16`	`from .importspawn`
`17`	`17`
`18`		`-from .importread_file,write_file`
`19`		`-`
	`18`	`+unix.unix_cmd= [`
	`19`	`+'make',`
	`20`	`+'',`
	`21`	`+'',`
	`22`	`+'-C',`
	`23`	`+]`
`20`	`24`
`21`	`25`	`unix.REAL_PORT='macOS'`
`22`	`26`
`@@ -29,6 +33,8 @@ def parse_args(extra_args, lv_cflags, board):`
`29`	`33`
`30`	`34`
`31`	`35`	`defbuild_commands(not_sure,extra_args,script_dir,lv_cflags,board):`
	`36`	`+`
	`37`	`+`
`32`	`38`	`return_build_commands(not_sure,extra_args,script_dir,lv_cflags,board)`
`33`	`39`
`34`	`40`
`@@ -92,9 +98,6 @@ def is_homebrew_arm(cmd):`
`92`	`98`	`returnFalse,cmd[0][0]`
`93`	`99`
`94`	`100`
`95`		`-EXTMOD_MK_PATH='lib/micropython/extmod/extmod.mk'`
`96`		`-`
`97`		`-`
`98`	`101`	`defsubmodules():`
`99`	`102`	`is_arm,brew_path=is_homebrew_arm([['brew','config']])`
`100`	`103`
`@@ -147,35 +150,8 @@ def submodules():`
`147`	`150`	`ifreturn_code!=0:`
`148`	`151`	`sys.exit(return_code)`
`149`	`152`
`150`		`-mbedtls=os.path.abspath('lib/micropython/lib/mbedtls/README.md')`
`151`		`-`
`152`		`-ifnotos.path.exists(mbedtls):`
`153`		`-return_code,_=unix.spawn(unix.submodules_cmd)`
`154`		`-`
`155`		`-ifreturn_code!=0:`
`156`		`-sys.exit(return_code)`
`157`	`153`
`158`	`154`	`defcompile(*args):# NOQA`
`159`		`-data=read_file('macOS',EXTMOD_MK_PATH)`
`160`		`-data=data.replace(`
`161`		`-'CFLAGS_EXTMOD += -DMICROPY_SSL_MBEDTLS=1 -I$(TOP)/$(MBEDTLS_DIR)/include',`
`162`		`-'CFLAGS_EXTMOD += -DMICROPY_SSL_MBEDTLS=1'`
`163`		`- )`
`164`		`-code= [`
`165`		`-'SRC_THIRDPARTY_C += lib/mbedtls_errors/mp_mbedtls_errors.c',`
`166`		`-'SRC_THIRDPARTY_C += $(wildcard\\',`
`167`		`-' $(MBEDTLS_DIR)/include//.h\\',`
`168`		`-' $(MBEDTLS_DIR)/library/*.h\\',`
`169`		`-')'`
`170`		`- ]`
`171`		`-`
`172`		`-data=data.replace(`
`173`		`-'SRC_THIRDPARTY_C += lib/mbedtls_errors/mp_mbedtls_errors.c',`
`174`		`-'\n'.join(code)`
`175`		`- )`
`176`		`-`
`177`		`-write_file(EXTMOD_MK_PATH,data)`
`178`		`-`
`179`	`155`	`_compile(*args)`
`180`	`156`
`181`	`157`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitf46c4ff

File tree

1 file changed

1 file changed

`‎builder/macOS.py‎`

0 commit comments