File tree 2 files changed +8
-4
lines changed
2 files changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -624,11 +624,12 @@ function _install {
624
624
fi
625
625
fi
626
626
627
- cp -f " $libomp " " $SOCKET_HOME /lib/$arch -desktop/$( basename " $libomp " ) "
627
+ mkdir -p " $SOCKET_HOME /lib/$arch -desktop/codesign"
628
+ cp -f " $libomp " " $SOCKET_HOME /lib/$arch -desktop/codesign/$( basename " $libomp " ) "
628
629
echo " # copied '$libomp_path '"
629
630
630
631
echo " # modifying the install name of the copied 'libomp.dylib'"
631
- quiet install_name_tool -id " @rpath/$( basename " $libomp_path " ) " " $SOCKET_HOME /lib/$arch -desktop/$( basename " $libomp " ) "
632
+ quiet install_name_tool -id " @rpath/$( basename " $libomp_path " ) " " $SOCKET_HOME /lib/$arch -desktop/codesign/ $( basename " $libomp " ) "
632
633
die $? " not ok - failed to modify the install name of copied 'libomp.dylib'"
633
634
else
634
635
if (( do_link == 1 )) ; then
Original file line number Diff line number Diff line change @@ -3094,7 +3094,10 @@ int main (int argc, char* argv[]) {
3094
3094
flags += " -I" + prefixFile ();
3095
3095
flags += " -I" + prefixFile (" include" );
3096
3096
flags += " -L" + prefixFile (" lib/" + platform.arch + " -desktop" );
3097
- flags += " -Wl,-rpath,@executable_path" ;
3097
+ if (flagCodeSign) {
3098
+ flags += " -Wl,-rpath,@executable_path" ;
3099
+ flags += " -L" + prefixFile (" lib/" + platform.arch + " -desktop/codesign" );
3100
+ }
3098
3101
flags += " -fPIC" ;
3099
3102
flags += " -lsocket-runtime" ;
3100
3103
flags += " -lomp" ;
@@ -3251,7 +3254,7 @@ int main (int argc, char* argv[]) {
3251
3254
3252
3255
fs::create_directories (paths.pathPackage / pathBase / " MacOS" );
3253
3256
fs::copy (
3254
- trim (prefixFile (" lib/" + platform.arch + " -desktop/libomp.dylib" )),
3257
+ trim (prefixFile (" lib/" + platform.arch + " -desktop/codesign/ libomp.dylib" )),
3255
3258
paths.pathPackage / pathBase / " MacOS" / " libomp.dylib" ,
3256
3259
fs::copy_options::overwrite_existing
3257
3260
);
You can’t perform that action at this time.
0 commit comments