fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adjust for gcc-7

Browse Source
This commit is contained in:
CN_SZTL 2019-10-13 13:39:08 +08:00
parent 00e528ec95
commit 1b162f3a50
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/libs/openssl/patches/120-strip-cflags-from-binary.patch
View File

@ -17,7 +17,7 @@ index 2c619c62e8..893128345a 100644
DEPEND[cversion.o]=buildinf.h
-GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC) $(LIB_CFLAGS) $(CPPFLAGS_Q)" "$(PLATFORM)"
+GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(filter-out -I% -iremap% -fmacro-prefix-map% -ffile-prefix-map%,$(CC) $(LIB_CFLAGS) $(CPPFLAGS_Q))" "$(PLATFORM)"
+GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(filter-out -I% -iremap% -fmacro-prefix-map%,$(CC) $(LIB_CFLAGS) $(CPPFLAGS_Q))" "$(PLATFORM)"
DEPEND[buildinf.h]=../configdata.pm
GENERATE[uplink-x86.s]=../ms/uplink-x86.pl $(PERLASM_SCHEME)

6
rules.mk
View File

@ -140,10 +140,10 @@ else
endif
ifeq ($(or $(CONFIG_EXTERNAL_TOOLCHAIN),$(CONFIG_TARGET_uml)),)
ifeq ($(CONFIG_GCC_USE_IREMAP),y)
iremap = -iremap$(1):$(2)
ifeq ($(CONFIG_GCC_USE_EMBEDDED_PATH_REMAP),y)
iremap = -fmacro-prefix-map=$(1)=$(2)
else
iremap = -ffile-prefix-map=$(1)=$(2)
iremap = -iremap$(1):$(2)
endif
endif

2
toolchain/gcc/Config.version
View File

@ -17,8 +17,8 @@ config GCC_VERSION_9
config GCC_VERSION
string
default "5.5.0" if GCC_VERSION_5
default "9.2.0" if GCC_VERSION_9
default "8.3.0" if GCC_VERSION_8
default "9.2.0" if GCC_VERSION_9
default "7.4.0"
config GCC_USE_IREMAP