drygdryg/calc
1
0
Fork 0
mirror of https://github.com/lcn2/calc.git synced 2025-08-16 01:03:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

change libcalc dynamic library to link with libcustcalc

Browse Source 
Under macOS, to reduce dependency chains, we remove functions
and data that are unreachable by the entry point or exported
symbols.  In particular, the macOS linker is used with both
"-dead_strip" and "-dead_strip_dylibs".

The libcalc shared library is now linked with libcustcalc.
This commit is contained in:
Landon Curt Noll
2023-08-17 14:23:29 -07:00
parent 3cd8fd7053
commit 4d32b138ed
7 changed files with 58 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
calc.c
View File

@@ -164,19 +164,13 @@ main(int argc, char **argv)
switch (c) {
case 'C':
#if defined(CUSTOM)
/*
* validate custtbl_allowed value
*
* We make an explicit reference to the custtbl_allowed symbol
* in libcustcalc (see custom/custtbl.c) so that the use
* of "-dead_strip_dylibs" with the macOS linker won't cause
* the calc to fail to load due to a missing symbol.
* error if libcustcalc was compiled with CUSTOM undefined
*/
if (custtbl_allowed == 0) {
fprintf(stderr, "%s: calc was built with "
"custom functions enabled, "
"but custtbl_allowed: %d == 0\n",
program, custtbl_allowed);
if (custom_compiled() == 0) {
fprintf(stderr, "%s: calc was built with custom functions enabled, "
"however custom_compiled() retuned 0", program);
exit(1);
}
@@ -186,19 +180,13 @@ main(int argc, char **argv)
allow_custom = TRUE;
break;
#else /* CUSTOM */
/*
* validate custtbl_allowed value
*
* We make an explicit reference to the custtbl_allowed symbol
* in libcustcalc (see custom/custtbl.c) so that the use
* of "-dead_strip_dylibs" with the macOS linker won't cause
* the calc to fail to load due to a missing symbol.
* error if libcustcalc was compiled with CUSTOM defined
*/
if (custtbl_allowed != 0) {
fprintf(stderr, "%s: calc was built with "
"custom functions disabled, "
"but custtbl_allowed: %d != 0\n",
program, custtbl_allowed);
if (custom_compiled() == 1) {
fprintf(stderr, "%s: calc was built with custom functions disabled, "
"however custom_compiled() retuned 1", program);
}
/*