equal
deleted
inserted
replaced
353 SHARED_LIBRARY_FLAGS ='-undefined dynamic_lookup' |
353 SHARED_LIBRARY_FLAGS ='-undefined dynamic_lookup' |
354 else |
354 else |
355 SHARED_LIBRARY_FLAGS="-dynamiclib -compatibility_version 1.0.0 -current_version 1.0.0 $PICFLAG" |
355 SHARED_LIBRARY_FLAGS="-dynamiclib -compatibility_version 1.0.0 -current_version 1.0.0 $PICFLAG" |
356 JVM_CFLAGS="$JVM_CFLAGS $PICFLAG" |
356 JVM_CFLAGS="$JVM_CFLAGS $PICFLAG" |
357 fi |
357 fi |
358 SET_EXECUTABLE_ORIGIN='-Wl,-rpath,@loader_path/.' |
358 SET_EXECUTABLE_ORIGIN='-Wl,-rpath,@loader_path$(or [$]1,/.)' |
359 SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN" |
359 SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN" |
360 SET_SHARED_LIBRARY_NAME='-Wl,-install_name,@rpath/[$]1' |
360 SET_SHARED_LIBRARY_NAME='-Wl,-install_name,@rpath/[$]1' |
361 SET_SHARED_LIBRARY_MAPFILE='-Wl,-exported_symbols_list,[$]1' |
361 SET_SHARED_LIBRARY_MAPFILE='-Wl,-exported_symbols_list,[$]1' |
362 else |
362 else |
363 # Default works for linux, might work on other platforms as well. |
363 # Default works for linux, might work on other platforms as well. |
373 |
373 |
374 if test "x$OPENJDK_TARGET_OS" = xmacosx; then |
374 if test "x$OPENJDK_TARGET_OS" = xmacosx; then |
375 # Linking is different on MacOSX |
375 # Linking is different on MacOSX |
376 PICFLAG='' |
376 PICFLAG='' |
377 SHARED_LIBRARY_FLAGS="-dynamiclib -compatibility_version 1.0.0 -current_version 1.0.0 $PICFLAG" |
377 SHARED_LIBRARY_FLAGS="-dynamiclib -compatibility_version 1.0.0 -current_version 1.0.0 $PICFLAG" |
378 SET_EXECUTABLE_ORIGIN='-Wl,-rpath,@loader_path/.' |
378 SET_EXECUTABLE_ORIGIN='-Wl,-rpath,@loader_path$(or [$]1,/.)' |
379 SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN" |
379 SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN" |
380 SET_SHARED_LIBRARY_NAME='-Wl,-install_name,@rpath/[$]1' |
380 SET_SHARED_LIBRARY_NAME='-Wl,-install_name,@rpath/[$]1' |
381 SET_SHARED_LIBRARY_MAPFILE='-Wl,-exported_symbols_list,[$]1' |
381 SET_SHARED_LIBRARY_MAPFILE='-Wl,-exported_symbols_list,[$]1' |
382 |
382 |
383 if test "x$STATIC_BUILD" = xfalse; then |
383 if test "x$STATIC_BUILD" = xfalse; then |