StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "revert-2216822-DZNPYURQOE"

Browse Source 
* changes:
  Revert "Drop dependency on musl_linker_script"
  Revert "Copy cc_object output files to a name that matches the m..."
This commit is contained in:
Alyssa Ketpreechasawat
2022-09-16 10:50:04 +00:00
committed by Gerrit Code Review
parent 2eade656df 89a7ba8e38
commit cd73714b88
3 changed files with 5 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cc/config/x86_linux_host.go
View File

@@ -109,7 +109,7 @@ var (
}, "-l")
muslCrtBeginStaticBinary, muslCrtEndStaticBinary = []string{"libc_musl_crtbegin_static"}, []string{"libc_musl_crtend"}
muslCrtBeginSharedBinary, muslCrtEndSharedBinary = []string{"libc_musl_crtbegin_dynamic"}, []string{"libc_musl_crtend"}
muslCrtBeginSharedBinary, muslCrtEndSharedBinary = []string{"libc_musl_crtbegin_dynamic", "musl_linker_script"}, []string{"libc_musl_crtend"}
muslCrtBeginSharedLibrary, muslCrtEndSharedLibrary = []string{"libc_musl_crtbegin_so"}, []string{"libc_musl_crtend_so"}
muslDefaultSharedLibraries = []string{"libc_musl"}