COMPILER = "@CMAKE_CXX_COMPILER@"
EXEC_ROOT = "@LIBCXX_BINARY_DIR@"
CMAKE_OSX_SYSROOT = "@CMAKE_OSX_SYSROOT@"
+INCLUDE_DIR = "@LIBCXX_INSTALL_INCLUDE_DIR@"
+INCLUDE_TARGET_DIR = "@LIBCXX_INSTALL_INCLUDE_TARGET_DIR@"
+LIBRARY_DIR = "@LIBCXX_INSTALL_LIBRARY_DIR@"
import os
import pipes
'-isysroot {}'.format(CMAKE_OSX_SYSROOT) if CMAKE_OSX_SYSROOT else ''
))
config.substitutions.append(('%{compile_flags}',
- '-nostdinc++ -isystem {} -I {}'.format(
- os.path.join(INSTALL_ROOT, 'include', 'c++', 'v1'),
+ '-nostdinc++ -isystem {} -isystem {} -I {}'.format(
+ os.path.join(INSTALL_ROOT, INCLUDE_DIR),
+ os.path.join(INSTALL_ROOT, INCLUDE_TARGET_DIR),
os.path.join(LIBCXX_ROOT, 'test', 'support'))
))
config.substitutions.append(('%{link_flags}',
'-nostdlib++ -L {0} -lc++ -Wl,-rpath,{0} -pthread'.format(
- os.path.join(INSTALL_ROOT, 'lib'))
+ os.path.join(INSTALL_ROOT, LIBRARY_DIR))
))
config.substitutions.append(('%{exec}',
'{} {} --execdir %T -- '.format(
COMPILER = "@CMAKE_CXX_COMPILER@"
EXEC_ROOT = "@LIBCXX_BINARY_DIR@"
CMAKE_OSX_SYSROOT = "@CMAKE_OSX_SYSROOT@"
+INCLUDE_DIR = "@LIBCXX_INSTALL_INCLUDE_DIR@"
+INCLUDE_TARGET_DIR = "@LIBCXX_INSTALL_INCLUDE_TARGET_DIR@"
+LIBRARY_DIR = "@LIBCXX_INSTALL_LIBRARY_DIR@"
import os
import pipes
'-isysroot {}'.format(CMAKE_OSX_SYSROOT) if CMAKE_OSX_SYSROOT else ''
))
config.substitutions.append(('%{compile_flags}',
- '-nostdinc++ -isystem {} -I {}'.format(
- os.path.join(INSTALL_ROOT, 'include', 'c++', 'v1'),
+ '-nostdinc++ -isystem {} -isystem {} -I {}'.format(
+ os.path.join(INSTALL_ROOT, INCLUDE_DIR),
+ os.path.join(INSTALL_ROOT, INCLUDE_TARGET_DIR),
os.path.join(LIBCXX_ROOT, 'test', 'support'))
))
config.substitutions.append(('%{link_flags}',
'-nostdlib++ -L {} -lc++ -lc++abi -pthread'.format(
- os.path.join(INSTALL_ROOT, 'lib'))
+ os.path.join(INSTALL_ROOT, LIBRARY_DIR))
))
config.substitutions.append(('%{exec}',
'{} {} --execdir %T -- '.format(