File tree Expand file tree Collapse file tree 1 file changed +1
-8
lines changed Expand file tree Collapse file tree 1 file changed +1
-8
lines changed Original file line number Diff line number Diff line change @@ -231,8 +231,6 @@ def source(self):
231
231
def _cxxflags (self ):
232
232
global_cxxflags = " " .join (self .conf .get ("tools.build:cxxflags" , default = [], check_type = list ))
233
233
env_cxxflags = VirtualBuildEnv (self ).vars ().get ("CXXFLAGS" )
234
- if env_cxxflags is None :
235
- env_cxxflags = os .getenv ("CXXFLAGS" , "" )
236
234
cxxflags = f"{ env_cxxflags } { global_cxxflags } " .strip ()
237
235
return cxxflags if len (cxxflags ) > 0 else None
238
236
@@ -260,12 +258,7 @@ def package(self):
260
258
with chdir (self , self .source_folder ):
261
259
# Note: this will fail to properly consider the package_folder if a "conan build" followed by a "conan export-pkg" is executed
262
260
self .run (self ._make_install_cmd )
263
- if is_apple_os (self ):
264
- # fix rpath to make installed library relocatable (CCI KB-H077)
265
- with chdir (self , os .path .join (self .package_folder , "lib" )):
266
- for dylib in glob .glob ("*.dylib" ):
267
- if not os .path .islink (dylib ):
268
- self .run (f"install_name_tool -id @rpath/{ os .path .basename (dylib )} { dylib } " )
261
+ fix_apple_shared_install_name (self )
269
262
270
263
def package_info (self ):
271
264
major_version = Version (self .version ).major
You can’t perform that action at this time.
0 commit comments